Merge branch 'ft_local_dev' into 'main'

pref:优化部分内容

See merge request huang/yun-teng-iot-front!419

@@ -8,13 +8,13 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '状态',
     title: '状态',
     dataIndex: 'deviceState',
     dataIndex: 'deviceState',
-    width: 120,
+    width: 80,
     slots: { customRender: 'deviceState' },
     slots: { customRender: 'deviceState' },
   },
   },
   {
   {
     title: '设备图片',
     title: '设备图片',
     dataIndex: 'deviceInfo.avatar',
     dataIndex: 'deviceInfo.avatar',
-    width: 120,
+    width: 80,
     slots: { customRender: 'img' },
     slots: { customRender: 'img' },
   },
   },
   {
   {
@@ -34,34 +34,36 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '所属产品',
     title: '所属产品',
     dataIndex: 'deviceProfile.name',
     dataIndex: 'deviceProfile.name',
-    width: 160,
+    width: 180,
     slots: { customRender: 'deviceProfile' },
     slots: { customRender: 'deviceProfile' },
     ellipsis: true,
     ellipsis: true,
   },
   },
   {
   {
     title: '所属组织',
     title: '所属组织',
     dataIndex: 'organizationDTO.name',
     dataIndex: 'organizationDTO.name',
+    width: 100,
   },
   },
   {
   {
     title: '客户',
     title: '客户',
     dataIndex: 'customerName',
     dataIndex: 'customerName',
+    width: 100,
   },
   },
   {
   {
     title: '标签',
     title: '标签',
     dataIndex: 'label',
     dataIndex: 'label',
-    width: 180,
+    width: 100,
   },
   },
   {
   {
     title: '最后连接时间',
     title: '最后连接时间',
     dataIndex: 'lastOnlineTime',
     dataIndex: 'lastOnlineTime',
     format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
     format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
-    width: 180,
+    width: 160,
   },
   },
   {
   {
     title: '最后断开时间',
     title: '最后断开时间',
     dataIndex: 'lastOfflineTime',
     dataIndex: 'lastOfflineTime',
     format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
     format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
-    width: 180,
+    width: 160,
   },
   },
 ];
 ];
 
 

@@ -5,6 +5,7 @@
         <template #commandSlot>
         <template #commandSlot>
           <div class="flex">
           <div class="flex">
             <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
             <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
+            <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button>
             <Tooltip title='{"method":"methodThingskit","params":{"pin":7,"value":1}}' class="ml-2">
             <Tooltip title='{"method":"methodThingskit","params":{"pin":7,"value":1}}' class="ml-2">
               <QuestionCircleOutlined style="font-size: 1rem" />
               <QuestionCircleOutlined style="font-size: 1rem" />
             </Tooltip>
             </Tooltip>
@@ -77,7 +78,11 @@
           jsonInstance.value = editor;
           jsonInstance.value = editor;
         });
         });
       });
       });
-
+      const handlePremitter = () => {
+        const value = unref(jsonInstance).get();
+        if (!value) return;
+        return unref(jsonInstance).set(value);
+      };
       const handleCancel = () => {
       const handleCancel = () => {
         resetFields();
         resetFields();
         unref(jsonInstance).set({});
         unref(jsonInstance).set({});
@@ -135,6 +140,7 @@
         jsoneditorRef,
         jsoneditorRef,
         jsonValue,
         jsonValue,
         jsonInstance,
         jsonInstance,
+        handlePremitter,
       };
       };
     },
     },
   });
   });

@@ -2,9 +2,9 @@
   <div style="background-color: #f0f2f5" class="dark:bg-dark-900">
   <div style="background-color: #f0f2f5" class="dark:bg-dark-900">
     <BasicTable @register="registerTable" class="dark:bg-dark-900">
     <BasicTable @register="registerTable" class="dark:bg-dark-900">
       <template #toolbar>
       <template #toolbar>
-        <Authority value="api:yt:smsLog:export">
+        <!-- <Authority value="api:yt:smsLog:export">
           <a-button type="primary" @click="handleCreate"> 导出 </a-button>
           <a-button type="primary" @click="handleCreate"> 导出 </a-button>
-        </Authority>
+        </Authority> -->
         <Authority value="api:yt:smsLog:delete">
         <Authority value="api:yt:smsLog:delete">
           <Popconfirm
           <Popconfirm
             title="您确定要批量删除数据"
             title="您确定要批量删除数据"

@@ -2,9 +2,9 @@
   <div style="background-color: #f0f2f5" class="dark:bg-dark-900">
   <div style="background-color: #f0f2f5" class="dark:bg-dark-900">
     <BasicTable @register="registerTable" class="dark:bg-dark-900">
     <BasicTable @register="registerTable" class="dark:bg-dark-900">
       <template #toolbar>
       <template #toolbar>
-        <Authority value="api:yt:smsLog:export">
+        <!-- <Authority value="api:yt:smsLog:export">
           <a-button type="primary" @click="handleExport"> 导出 </a-button>
           <a-button type="primary" @click="handleExport"> 导出 </a-button>
-        </Authority>
+        </Authority> -->
         <Authority value="api:yt:smsLog:delete">
         <Authority value="api:yt:smsLog:delete">
           <Popconfirm
           <Popconfirm
             title="您确定要批量删除数据"
             title="您确定要批量删除数据"

@@ -8,12 +8,12 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '模板名称',
     title: '模板名称',
     dataIndex: 'templateName',
     dataIndex: 'templateName',
-    width: 200,
+    width: 150,
   },
   },
   {
   {
     title: '配置名称',
     title: '配置名称',
     dataIndex: 'messageConfig.configName',
     dataIndex: 'messageConfig.configName',
-    width: 180,
+    width: 120,
     slots: { customRender: 'config' },
     slots: { customRender: 'config' },
   },
   },
   {
   {

@@ -133,7 +133,7 @@
     });
     });
   });
   });
   // 初始化编辑器
   // 初始化编辑器
-  const initEditor = (jsScript?: string) => {
+  const initEditor = () => {
     aceEditor.value = ace.edit(aceRef.value, {
     aceEditor.value = ace.edit(aceRef.value, {
       maxLines: 12, // 最大行数，超过会自动出现滚动条
       maxLines: 12, // 最大行数，超过会自动出现滚动条
       minLines: 12, // 最小行数，还未到最大行数时，编辑器会自动伸缩大小
       minLines: 12, // 最小行数，还未到最大行数时，编辑器会自动伸缩大小
@@ -147,7 +147,7 @@
       enableBasicAutocompletion: true,
       enableBasicAutocompletion: true,
       enableLiveAutocompletion: true,
       enableLiveAutocompletion: true,
     });
     });
-    aceEditor.value.setValue(jsScript);
+    aceEditor.value.setValue();
     beautify(aceEditor.value.session);
     beautify(aceEditor.value.session);
     scriptForm.convertJs = aceEditor.value.getValue();
     scriptForm.convertJs = aceEditor.value.getValue();
   };
   };

@@ -46,7 +46,7 @@
     isText.value = data.isText;
     isText.value = data.isText;
     isTitle.value = data.isTitle;
     isTitle.value = data.isTitle;
     editData.data = data.record;
     editData.data = data.record;
-    converScriptRef.value?.initEditor(data.record?.configuration?.jsScript);
+    converScriptRef.value?.initEditor();
     setModalProps({ loading: false });
     setModalProps({ loading: false });
     if (!unref(isViewDetail)) {
     if (!unref(isViewDetail)) {
       const title =
       const title =
@@ -66,6 +66,8 @@
         if (data.record) {
         if (data.record) {
           const res = await getScriptManageDetail(data.record);
           const res = await getScriptManageDetail(data.record);
           converScriptRef.value?.setFormData(res);
           converScriptRef.value?.setFormData(res);
+        } else {
+          converScriptRef.value?.setDefaultRadio('HEX', 'true');
         }
         }
       }
       }
       setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });
       setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });