Merge branch 'ft' into 'main_dev'

fix: DEFECT-1241 设备公开和私有使用效果(看图修改) See merge request yunteng/thingskit-front!555

Merge branch 'ft' into 'main_dev'
fix: DEFECT-1241 设备公开和私有使用效果(看图修改) See merge request yunteng/thingskit-front!555
xp.Huang
2 parents 2ef6cb19 b285d2a2
Showing 5 changed files with 75 additions and 8 deletions
src/views/device/list/config/device.data.ts
src/views/device/list/index.vue
src/views/scriptmanage/converscript/ConverScript.vue
src/views/scriptmanage/converscript/TestScriptModal.vue
src/views/scriptmanage/converscript/config.data.ts
--- a/src/views/device/list/config/device.data.ts
View file @09796c3
+++ b/src/views/device/list/config/device.data.ts
View file @09796c3
@@ -18,13 +18,13 @@ export const columns: BasicColumn[] = [
   {
     title: '设备图片',
     dataIndex: 'deviceInfo.avatar',
-    width: 80,
+    width: 70,
     slots: { customRender: 'img' },
   },
   {
     dataIndex: 'name',
     title: '设备名称/设备SN',
-    width: 200,
+    width: 210,
     slots: { customRender: 'name', title: 'deviceTitle' },
     customRender: ({ record }) => {
       return h(
@@ -32,10 +32,10 @@ export const columns: BasicColumn[] = [
         {
           style: { cursor: 'pointer', color: '#377dff' },
           onClick: () => {
-            handeleCopy(record.name || record.alias);
+            handeleCopy(`${record.alias}/${record.name}`);
           },
         },
-        record.name || record.alias
+        `${record.alias}/${record.name}`
       );
     },
   },
--- a/src/views/device/list/index.vue
View file @09796c3
+++ b/src/views/device/list/index.vue
View file @09796c3
@@ -124,7 +124,7 @@
                 ? {
                     label: '取消分配',
                     icon: 'mdi:account-arrow-left',
-                    ifShow: authBtn(role),
+                    ifShow: authBtn(role) && !record?.customerAdditionalInfo?.isPublic,
                     popConfirm: {
                       title: '是否取消分配客户',
                       confirm: handleCancelDispatchCustomer.bind(null, record),
--- a/src/views/scriptmanage/converscript/ConverScript.vue
View file @09796c3
+++ b/src/views/scriptmanage/converscript/ConverScript.vue
View file @09796c3
@@ -58,6 +58,14 @@
       <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
         <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
           <template #extra>
+            <Button
+              v-show="ifAdd && !view"
+              @click="onHandleTestExample(scriptForm.scriptType)"
+              style="position: relative; top: -4rem; right: -6.6rem"
+              type="primary"
+            >
+              测试用例</Button
+            >
             <a-button @click="handleFormat" size="small">格式化</a-button>
             <Tooltip
               v-if="scriptForm.scriptType !== 'TRANSPORT_TCP_UP'"
@@ -115,7 +123,13 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
-  import { defaultAuthTitle, defaultUpTitle, defaultScriptTypeContent } from './config.data';
+  import {
+    defaultAuthTitle,
+    defaultUpTitle,
+    defaultScriptTypeContent,
+    defaultTestUpExample,
+    defaultTestAuthExample,
+  } from './config.data';
   import { useAppStore } from '/@/store/modules/app';
   import TestScriptModal from './TestScriptModal.vue';
   import { useModal } from '/@/components/Modal';
@@ -207,6 +221,15 @@
     aceEditor.value.setValue(defaultScriptTypeContent[type]);
   };
+  const onHandleTestExample = (example) => {
+    if (example === 'TRANSPORT_TCP_UP') {
+      aceEditor.value?.setValue(defaultTestUpExample);
+    } else {
+      aceEditor.value?.setValue(defaultTestAuthExample);
+    }
+    handleFormat();
+  };
+
   const handleCopy = () => {
     const valueRef = aceEditor.value.getValue();
     const value = unref(valueRef);
@@ -303,10 +326,12 @@
   const [registerModal, { openModal }] = useModal();
   const onHandleClick = (o) => {
+    const getTestContent = aceEditor.value?.getValue();
     openModal(true, {
       isAuth: '',
-      isUpdate: false,
+      isUpdate: o,
       record: o === 'add' ? null : getRecordId.value,
+      testContent: getTestContent,
       isTest: true,
       isText: 'test',
       isTitle: 'test',
--- a/src/views/scriptmanage/converscript/TestScriptModal.vue
View file @09796c3
+++ b/src/views/scriptmanage/converscript/TestScriptModal.vue
View file @09796c3
@@ -70,8 +70,9 @@
       if (unref(isTitle) == 'test') {
         if (data.record) {
           const res = await getScriptManageDetail(data.record);
-          converScriptRef.value?.setFormData(res);
+          converScriptRef.value?.setFormData({ ...res, convertJs: data?.testContent });
         } else {
+          converScriptRef.value?.setFormData({ convertJs: data?.testContent });
           converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP');
         }
       }
--- a/src/views/scriptmanage/converscript/config.data.ts
View file @09796c3
+++ b/src/views/scriptmanage/converscript/config.data.ts
View file @09796c3
@@ -90,3 +90,44 @@ export const defaultScriptTypeContent = {
     'var attrData = {};var teleData = {};teleData.source= params;out.datas = teleData;out.telemetry =true;out.ackMsg = params;out.deviceName = "sensor";out.ts = Date.now();',
   TRANSPORT_TCP_AUTH: 'out.password = params;out.success = params;',
 };
+
+export const defaultTestUpExample = `
+var teleData = {};
+/**
+ * 物模型数据(可选)：原始数据
+ */
+teleData.source= params;
+/**
+ * 直连设备：sensor是产品物模型中所定义属性的标识符
+ * 网关设备：sensor是网关子设备的设备名称/SN码
+ */
+teleData.sensor= params+123;
+out.datas = teleData;
+/**
+ * 必填：true表示设备上报的遥测数据，false表示命令下发的响应数据
+ */
+out.telemetry = true;
+/**
+ * 必填：设备或命令下发的唯一标识，设备的唯一标识必须与设备信息的设备名称/SN码一致
+ */
+out.identifier = "01";
+/**
+ * 可选：服务端收到设备数据后，响应的消息内容
+ */
+out.ackMsg = params;
+/**
+ * 可选：默认使用服务器时间，可以使用数据内的时间
+ */
+out.ts = Date.now();
+`;
+
+export const defaultTestAuthExample = `
+/**
+ * 必填：设备的访问令牌
+ */
+out.password = params;
+/**
+ * 选填：设备鉴权成功后响应给设备的信息
+ */
+out.success = params;
+`;