Merge branch 'ft' into 'main_dev'

fix:修复Teambition上的问题

See merge request yunteng/thingskit-front!545

@@ -20,6 +20,17 @@
         mode: 'code',
         mainMenuBar: false,
         statusBar: false,
+        onFocus: () => {},
+        onBlur: () => {
+          setJsonValue('执行测试结果为：');
+        },
+        onChangeText: (e) => {
+          if (e.length === 0) {
+            setJsonValue('执行测试结果为：');
+          } else {
+            // setJsonValue(undefined);
+          }
+        },
       } as object;
       let editor = new jsoneditor(jsoneditorRef.value, options);
       editor.set(jsonValue.value);
@@ -29,6 +40,12 @@
 
   const getJsonValue = () => unref(jsonInstance).get();
 
+  // const setJsonMode = (mode) => {
+  //   nextTick(() => {
+  //     unref(jsonInstance).setMode(mode);
+  //   });
+  // };
+
   const setJsonValue = (Json) => {
     nextTick(() => {
       unref(jsonInstance).set(Json);

@@ -4,14 +4,16 @@
       <a-row>
         <Button @click="handleExcute" type="primary"> 执行测试请求 </Button>
       </a-row>
-      <a-row class="mt-8" type="flex" justify="center" align="middle">
-        <a-col :span="2"> 测试地址 </a-col>
-        <a-col :span="22">
-          <Tag color="blue" style="width: 31.6vw; white-space: normal; height: auto">
-            {{ apiUrl?.split('{?')[0] }}
-          </Tag>
-        </a-col>
-      </a-row>
+      <div v-if="isShowTestResult" style="display: flex; justify-content: space-between">
+        <a-row class="mt-8" type="flex" justify="center" align="middle">
+          <a-col :span="3"> 测试地址 </a-col>
+          <a-col :span="21">
+            <Tag color="blue" style="width: 31.6vw; white-space: normal; height: auto">
+              {{ apiUrl?.split('{?')[0] }}
+            </Tag>
+          </a-col>
+        </a-row>
+      </div>
     </div>
     <div class="mt-8">
       <a-row type="flex" justify="center">
@@ -35,6 +37,7 @@
   import { useUtils } from '../../../hooks/useUtils';
   import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
   import { Tag } from 'ant-design-vue';
+  import { useThrottleFn } from '@vueuse/shared';
 
   const emits = defineEmits(['emitExcute']);
 
@@ -87,12 +90,19 @@
 
   const isPostToken = ref('');
 
+  const isShowTestResult = ref(false);
+
   //执行测试接口
   const handleExcute = () => {
     emits('emitExcute');
-    getValue();
+    useThrottle();
+    isShowTestResult.value = true;
   };
 
+  const useThrottle = useThrottleFn(() => {
+    getValue();
+  }, 2000);
+
   const getValue = async () => {
     await nextTick();
     //获取Params和Header和Body

@@ -33,20 +33,27 @@
         </template>
         <template #slotFillAddress="{ model }">
           <div>
-            <Tag color="blue" style="width: 35vw; white-space: normal; height: auto">
+            <Tag
+              v-if="model['originUrlType'] === 'server_url'"
+              color="blue"
+              style="width: 35vw; white-space: normal; height: auto"
+            >
               {{
-                ` ${
-                  model['originUrlType'] !== 'server_url'
-                    ? !model['requestOriginUrl']
-                      ? ''
-                      : model['requestOriginUrl'] + model['requestHttpTypeAndUrl']?.requestUrl
-                    : `${templateFillAddress(model['requestContentType'], model['originUrlType'])}${
-                        model['requestHttpTypeAndUrl']?.requestUrl
-                      }`
-                } 
+                ` ${`${templateFillAddress(model['requestContentType'], model['originUrlType'])}${
+                  model['requestHttpTypeAndUrl']?.requestUrl
+                }`} 
                 `
               }}
             </Tag>
+            <template v-else>
+              <Tag
+                v-if="model['requestOriginUrl']"
+                color="blue"
+                style="width: 35vw; white-space: normal; height: auto"
+              >
+                {{ ` ${model['requestOriginUrl'] + model['requestHttpTypeAndUrl']?.requestUrl}` }}
+              </Tag>
+            </template>
           </div>
         </template>
       </BasicForm>

@@ -75,9 +75,12 @@
           </Tooltip>
         </template>
         <template #deviceProfile="{ record }">
-          <a-button type="link" class="ml-2" @click="goDeviceProfile(record.deviceProfile.name)">
-            {{ record.deviceProfile.name }}
-          </a-button>
+          <Tag.CheckableTag
+            @click="goDeviceProfile(record.deviceProfile.name)"
+            style="white-space: normal; height: auto; cursor: pointer"
+          >
+            <span style="color: #377dff">{{ record.deviceProfile.name }}</span>
+          </Tag.CheckableTag>
         </template>
 
         <template #deviceType="{ record }">

@@ -2,18 +2,20 @@ import { FormSchema } from '/@/components/Form';
 
 export const tcpSchemas: FormSchema[] = [
   {
-    field: 'upScriptId',
-    label: '上行脚本',
+    field: 'authScriptId',
+    label: '鉴权脚本',
     component: 'Input',
-    slot: 'upScriptId',
+    slot: 'authScriptId',
     colProps: { span: 24 },
+    required: true,
   },
   {
-    field: 'authScriptId',
-    label: '鉴权脚本',
+    field: 'upScriptId',
+    label: '上行脚本',
     component: 'Input',
-    slot: 'authScriptId',
+    slot: 'upScriptId',
     colProps: { span: 24 },
+    required: true,
   },
 ];
 

 <template>
   <div>
     <BasicForm :showResetButton="false" :showSubmitButton="false" @register="register">
-      <template #upScriptId="{ model, field }">
+      <template #authScriptId="{ model, field }">
         <div style="display: flex; align-items: center">
           <div>
             <Select
-              @change="handleUpChange"
+              @change="handleAuthChange"
               placeholder="请选择"
               v-model:value="model[field]"
               style="width: 305px"
               show-search
-              :options="selectUpOptions"
-              :filter-option="handleSearch"
+              :options="selectAuthOptions"
+              :filter-option="handleAuthSearch"
               allowClear
             />
           </div>
           <div>
             <span
-              @click="handleCreateOrEdit('add')"
+              @click="handleCreateOrEditAuth('add')"
               class="ml-2"
               style="color: #409eff; cursor: pointer"
               size="small"
@@ -25,27 +25,27 @@
             >
           </div>
         </div>
-        <a-button @click="handleCreateOrEdit('test')" class="mt-4" type="primary"
+        <a-button @click="handleCreateOrEditAuth('test')" class="mt-4" type="primary"
           >测试脚本</a-button
         >
       </template>
-      <template #authScriptId="{ model, field }">
+      <template #upScriptId="{ model, field }">
         <div style="display: flex; align-items: center">
           <div>
             <Select
-              @change="handleAuthChange"
+              @change="handleUpChange"
               placeholder="请选择"
               v-model:value="model[field]"
               style="width: 305px"
               show-search
-              :options="selectAuthOptions"
-              :filter-option="handleAuthSearch"
+              :options="selectUpOptions"
+              :filter-option="handleSearch"
               allowClear
             />
           </div>
           <div>
             <span
-              @click="handleCreateOrEditAuth('add')"
+              @click="handleCreateOrEdit('add')"
               class="ml-2"
               style="color: #409eff; cursor: pointer"
               size="small"
@@ -53,7 +53,7 @@
             >
           </div>
         </div>
-        <a-button @click="handleCreateOrEditAuth('test')" class="mt-4" type="primary"
+        <a-button @click="handleCreateOrEdit('test')" class="mt-4" type="primary"
           >测试脚本</a-button
         >
       </template>
@@ -111,7 +111,7 @@
     }
   };
 
-  const [register, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+  const [register, { validate, resetFields, setFieldsValue }] = useForm({
     labelWidth: 180,
     schemas: tcpSchemas,
     actionColOptions: {
@@ -171,8 +171,9 @@
     }
   };
 
-  const getFormData = () => {
-    const values = getFieldsValue();
+  const getFormData = async () => {
+    const values = await validate();
+    if (!values) return;
     return {
       ...values,
       type: 'TCP',

@@ -59,10 +59,14 @@
         <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
           <template #extra>
             <a-button @click="handleFormat" size="small">格式化</a-button>
-            <Tooltip v-if="!ifAdd" :title="defaultAuthTitle" class="ml-2">
+            <Tooltip
+              v-if="scriptForm.scriptType !== 'TRANSPORT_TCP_UP'"
+              :title="defaultAuthTitle"
+              class="ml-2"
+            >
               <QuestionCircleOutlined style="font-size: 1rem" />
             </Tooltip>
-            <Tooltip v-if="!ifAdd" :title="defaultUpTitle" class="ml-2">
+            <Tooltip v-else :title="defaultUpTitle" class="ml-2">
               <QuestionCircleOutlined style="font-size: 1rem" />
             </Tooltip>
           </template>
@@ -95,7 +99,7 @@
         />
       </a-form-item>
     </a-form>
-    <TestScriptModal @register="registerModal" @success="handleSuccess" />
+    <TestScriptModal @register="registerModal" />
   </div>
 </template>
 <script setup lang="ts">
@@ -195,6 +199,7 @@
 
   const handleScriptType = ({ target }) => {
     const { value } = target;
+    scriptForm.scriptType = value;
     switchScriptTypeGetContent(value);
   };
 

@@ -238,7 +238,11 @@
       const userStore = useUserStore();
       const permissionStore = usePermissionStore();
       const go = useGo();
-      async function handleLoginTenantAdmin(record: { tbUser: string; id: string }) {
+      async function handleLoginTenantAdmin(record: {
+        tbUser: string;
+        id: string;
+        hasPassword: boolean;
+      }) {
         try {
           const { token, refreshToken } = await getUserToken(record.id);
           userStore.storeToken(token, refreshToken);
@@ -253,7 +257,8 @@
           });
           router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
           permissionStore.setDynamicAddedRoute(true);
-          go(PageEnum.BASE_HOME);
+          if (record?.hasPassword) go(PageEnum.BASE_HOME);
+          else go(PageEnum.SYSTEM_PASSWORD);
         } catch (error) {
         } finally {
         }