Merge branch 'fix/DEFECT-1761' into 'main_dev'

fix: 看板组件删除添加确认弹框

See merge request yunteng/thingskit-front!1016

@@ -222,6 +222,14 @@
                 </div>
                 </div>
               </template>
               </template>
               <template class="ant-card-actions" #actions>
               <template class="ant-card-actions" #actions>
+                <Tooltip title="预览">
+                  <AuthIcon
+                    :auth="ConfigurationTemplatePermission.PREVIEW"
+                    class="!text-lg"
+                    icon="ant-design:eye-outlined"
+                    @click="handlePreview(item)"
+                  />
+                </Tooltip>
                 <Tooltip v-if="!isCustomerUser" title="设计">
                 <Tooltip v-if="!isCustomerUser" title="设计">
                   <AuthIcon
                   <AuthIcon
                     :auth="ConfigurationTemplatePermission.DESIGN"
                     :auth="ConfigurationTemplatePermission.DESIGN"

@@ -22,7 +22,6 @@
         >
         >
           <div class="flex flex-col justify-center items-center">
           <div class="flex flex-col justify-center items-center">
             <img :src="JSONImage" alt="avatar" class="w-20 h-20" />
             <img :src="JSONImage" alt="avatar" class="w-20 h-20" />
-            <!-- <Button type="primary" :loading="importLoading" class="mt-2"> JSON导入 </Button> -->
           </div>
           </div>
         </Upload>
         </Upload>
         <Upload
         <Upload
@@ -33,7 +32,6 @@
         >
         >
           <div class="flex flex-col justify-center items-center">
           <div class="flex flex-col justify-center items-center">
             <img :src="CSVImage" alt="avatar" class="w-20 h-20" />
             <img :src="CSVImage" alt="avatar" class="w-20 h-20" />
-            <!-- <Button type="primary" class="mt-2">CSV导入</Button> -->
           </div>
           </div>
         </Upload>
         </Upload>
       </div>
       </div>

@@ -268,68 +268,8 @@
     }
     }
   };
   };
 
 
-  // const paseJSON = (string: string) => {
-  //   let data = null;
-  //   let flag = false;
-  //   try {
-  //     if (!isString(string)) return { flag: false, data };
-  //     data = JSON.parse(string);
-  //     flag = true;
-  //     if (!isObject(data)) flag = false;
-  //   } catch (error) {}
-  //   return { flag, data };
-  // };
-
   const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
   const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
 
 
-  // const importLoading = ref(false);
-  // const handleImportModel = async (data: { file: File }) => {
-  //   const fileReader = new FileReader();
-
-  //   fileReader.onload = async () => {
-  //     const { flag, data } = paseJSON(fileReader.result as string);
-  //     if (!flag) {
-  //       createMessage.warning('JSON解析失败,请导入正确的JSON~');
-  //       return;
-  //     }
-  //     try {
-  //       importLoading.value = true;
-
-  //       Object.keys(data || {}).forEach((key) => {
-  //         const value = (data || {})[key];
-  //         if (value && isEmptyObject(value)) {
-  //           (data || {})[key] = [];
-  //         }
-  //       });
-
-  //       const result =
-  //         (unref(isPlatformAdmin) || unref(isSysadmin)) && props.record.ifShowClass
-  //           ? await importModelCategory({
-  //               categoryId: props.record.id,
-  //               data: data!,
-  //               functionType: 'all',
-  //             })
-  //           : await importModelOfMatter({
-  //               tkDeviceProfileId: props.record.id,
-  //               data: data!,
-  //               functionType: 'all',
-  //             });
-
-  //       result
-  //         ? createMessage.success('导入成功~')
-  //         : createMessage.error('JSON解析失败,请导入正确的JSON~');
-
-  //       result && reload();
-  //     } catch (error) {
-  //       throw error;
-  //     } finally {
-  //       importLoading.value = false;
-  //     }
-  //   };
-
-  //   fileReader.readAsText(data.file, 'utf-8');
-  // };
-
   // 选择导入物模型的方式
   // 选择导入物模型的方式
   const handleSelectImport = () => {
   const handleSelectImport = () => {
     openModalSelect(true, {
     openModalSelect(true, {

@@ -60,7 +60,10 @@
       event: DataActionModeEnum.DELETE,
       event: DataActionModeEnum.DELETE,
       icon: 'ant-design:delete-outlined',
       icon: 'ant-design:delete-outlined',
       auth: VisualComponentPermission.DELETE,
       auth: VisualComponentPermission.DELETE,
-      onClick: handleDelete,
+      popconfirm: {
+        title: '是否确认删除操作?',
+        onConfirm: handleDelete.bind(null),
+      },
     },
     },
   ]);
   ]);