Merge branch 'ft' into 'main_dev'

pref: 调整Topic和公共接口管理

See merge request yunteng/thingskit-front!547

@@ -22,6 +22,7 @@
         v-show="getRequestBody.content.requestParamsBodyType === 'x-www-form-urlencoded'"
       />
       <JsonEditor
+        :showBtn="false"
         style="width: 35vw; height: 30vh"
         v-show="getRequestBody.content.requestParamsBodyType === 'json'"
         ref="jsonEditorRef"

 <template>
-  <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
+  <div class="flex" style="justify-content: space-between; align-content: center">
+    <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
+    <div class="ml-2 -mt-1.5">
+      <Button v-if="showBtn" @click="onHandleCopy" type="text"> 复制测试结果 </Button>
+    </div>
+  </div>
 </template>
 
 <script lang="ts" setup>
   import { ref, onMounted, nextTick, unref } from 'vue';
   import jsoneditor from 'jsoneditor';
   import 'jsoneditor/dist/jsoneditor.min.css';
+  import { Button } from 'ant-design-vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const props = defineProps({
+    showBtn: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  const { createMessage } = useMessage();
 
   // json 以及初始化JSON
   const jsoneditorRef = ref();
@@ -20,15 +36,15 @@
         mode: 'code',
         mainMenuBar: false,
         statusBar: false,
-        onFocus: () => {},
-        onBlur: () => {
-          setJsonValue('执行测试结果为：');
+        onFocus: () => {
+          if (props.showBtn) {
+            setJsonValue('测试结果为');
+          }
         },
+        onBlur: () => {},
         onChangeText: (e) => {
-          if (e.length === 0) {
-            setJsonValue('执行测试结果为：');
-          } else {
-            // setJsonValue(undefined);
+          if (props.showBtn) {
+            if (e.length) return setJsonValue('测试结果为');
           }
         },
       } as object;
@@ -40,11 +56,11 @@
 
   const getJsonValue = () => unref(jsonInstance).get();
 
-  // const setJsonMode = (mode) => {
-  //   nextTick(() => {
-  //     unref(jsonInstance).setMode(mode);
-  //   });
-  // };
+  const setJsonMode = (mode) => {
+    nextTick(() => {
+      unref(jsonInstance).setMode(mode);
+    });
+  };
 
   const setJsonValue = (Json) => {
     nextTick(() => {
@@ -52,10 +68,28 @@
     });
   };
 
+  function copyToClip(content, message) {
+    var aux = document.createElement('input');
+    aux.setAttribute('value', content);
+    document.body.appendChild(aux);
+    aux.select();
+    document.execCommand('copy');
+    document.body.removeChild(aux);
+    if (message == null) {
+      createMessage.success('复制成功！');
+    } else {
+    }
+  }
+
+  const onHandleCopy = () => {
+    copyToClip(JSON.stringify(getJsonValue()), null);
+  };
+
   defineExpose({
     getJsonValue,
     setJsonValue,
     jsonInstance,
+    setJsonMode,
   });
 </script>
 

@@ -8,11 +8,6 @@
             allowClear
             @change="onSelect"
             style="width: 150px"
-            :getPopupContainer="
-              (triggerNode) => {
-                return triggerNode.parentNode;
-              }
-            "
             placeholder="请选择租户"
             :options="selectOptions"
           />
@@ -22,17 +17,12 @@
             @change="onSelctTenant"
             style="width: 150px; margin-left: 10px"
             v-if="selectTenantOptions.length > 0"
-            :getPopupContainer="
-              (triggerNode) => {
-                return triggerNode.parentNode;
-              }
-            "
             placeholder="请选择租户"
             :options="selectTenantOptions"
           />
         </div>
         <Button
-          :disabled="testDisabled"
+          :disabled="isAdmin(role) ? testDisabled : false"
           class="ml-2"
           @click="handleTest(isSingleClickText)"
           type="primary"
@@ -47,7 +37,7 @@
               <TestBodyCellTable :token="getToken" ref="testEditCellTableRef" />
             </div>
             <div style="width: 30vw" v-else-if="data?.type === 'json'">
-              <JsonEditor style="width: 35vw; height: 30vh" ref="jsonEditorRef" />
+              <JsonEditor :showBtn="false" style="width: 35vw; height: 30vh" ref="jsonEditorRef" />
             </div>
             <div style="width: 30vw" v-else-if="data?.type === 'xml'">
               <a-textarea v-model:value="xmlContent" placeholder="请输入xml" :rows="6" />

@@ -16,14 +16,22 @@
       </div>
     </div>
     <div class="mt-8">
-      <a-row type="flex" justify="center">
+      <a-row type="flex" justify="space-between" align="middle">
         <a-col :span="24">
-          <JsonEditor
-            v-if="isWebSocketType === '2'"
-            style="width: 35vw; height: 40vh"
-            ref="jsonWebsocketEditorRef"
-          />
-          <JsonEditor v-else style="width: 35vw; height: 40vh" ref="jsonEditorRef" />
+          <div>
+            <JsonEditor
+              :showBtn="true"
+              v-if="isWebSocketType === '2'"
+              style="width: 40vw; height: 40vh"
+              ref="jsonWebsocketEditorRef"
+            />
+            <JsonEditor
+              :showBtn="true"
+              v-else
+              style="width: 40vw; height: 40vh"
+              ref="jsonEditorRef"
+            />
+          </div>
         </a-col>
       </a-row>
     </div>
@@ -260,8 +268,8 @@
       showTestFlag.value = false;
     }
     nextTick(() => {
-      jsonEditorRef.value?.setJsonValue('执行测试结果为：');
-      jsonWebsocketEditorRef.value?.setJsonValue('执行测试结果为：');
+      jsonEditorRef.value?.setJsonValue('测试结果为');
+      jsonWebsocketEditorRef.value?.setJsonValue('测试结果为');
     });
     isWebSocketType.value = '0';
   };

@@ -8,11 +8,6 @@
             v-model:value="selectTenant"
             @change="onSelect"
             style="width: 150px"
-            :getPopupContainer="
-              (triggerNode) => {
-                return triggerNode.parentNode;
-              }
-            "
             placeholder="请选择租户"
             :options="selectOptions"
           />
@@ -22,17 +17,12 @@
             @change="onSelctTenant"
             style="width: 150px; margin-left: 10px"
             v-if="selectTenantOptions.length > 0"
-            :getPopupContainer="
-              (triggerNode) => {
-                return triggerNode.parentNode;
-              }
-            "
             placeholder="请选择租户"
             :options="selectTenantOptions"
           />
         </div>
         <Button
-          :disabled="testDisabled"
+          :disabled="isAdmin(role) ? testDisabled : false"
           class="ml-2"
           @click="handleTest(isSingleClickText)"
           type="primary"

@@ -189,6 +189,11 @@ export const schemas: FormSchema[] = [
     component: 'Input',
     slot: 'slotFillAddress',
     colProps: { span: 24 },
+    ifShow: ({ values }) => {
+      if (values['requestOriginUrl']) {
+        return true;
+      } else return false;
+    },
   },
   {
     field: 'requestSQLKey',

@@ -135,7 +135,7 @@ export const list = [
   {
     deviceType: '网关/直连设备',
     function: '设备端请求服务端共享属性及客户端属性',
-    release: 'v1/devices/me/attributes/response/$request_id',
+    release: 'v1/devices/me/attributes/request/$request_id',
     subscribe: 'v1/devices/me/attributes/response/+',
     platform: '订阅',
     device: '发布',

@@ -44,21 +44,23 @@
   const selectOptions: any = ref([]);
   //获取对应设备属性
   const getAttr = async (orgId, _) => {
-    const res = await getAttribute(orgId);
-    if (Array.isArray(res)) {
-      selectOptions.value = res.map((o) => {
-        let obj: any = {};
-        if (o?.identifier !== null) {
-          obj = {
-            label: o?.identifier,
-            value: o?.identifier,
-          };
-          return obj;
-        }
-      });
-      //如果服务端返回的数组里含有null 过滤null值
-      const excludeNull = selectOptions.value.filter(Boolean);
-      selectOptions.value = excludeNull;
+    if (orgId) {
+      const res = await getAttribute(orgId);
+      if (Array.isArray(res)) {
+        selectOptions.value = res.map((o) => {
+          let obj: any = {};
+          if (o?.identifier !== null) {
+            obj = {
+              label: o?.identifier,
+              value: o?.identifier,
+            };
+            return obj;
+          }
+        });
+        //如果服务端返回的数组里含有null 过滤null值
+        const excludeNull = selectOptions.value.filter(Boolean);
+        selectOptions.value = excludeNull;
+      }
     }
   };
   //动态数据