Merge branch 'ft' into 'main_dev'

fix: DEFECT-1330 数据流转中,待选设备勾选了设备后,待选设备的按钮和已选设备的按钮都生效了

See merge request yunteng/thingskit-front!645

@@ -62,6 +62,8 @@
 
 
   const pendingOptions = ref<Options[]>([]);
   const pendingOptions = ref<Options[]>([]);
 
 
+  const selectedConfirmQueue = ref<Options[]>([]);
+
   const pendingConfirmQueue = ref<Options[]>([]);
   const pendingConfirmQueue = ref<Options[]>([]);
 
 
   const selectedTotal = ref(0);
   const selectedTotal = ref(0);
@@ -115,10 +117,10 @@
       rowSelection: {
       rowSelection: {
         type: 'checkbox',
         type: 'checkbox',
         onSelect: (_record: Recordable, _selected: boolean, selectedRows: Object[]) => {
         onSelect: (_record: Recordable, _selected: boolean, selectedRows: Object[]) => {
-          pendingConfirmQueue.value = selectedRows;
+          selectedConfirmQueue.value = selectedRows;
         },
         },
         onSelectAll: (_selected: boolean, selectedRows: Recordable[]) => {
         onSelectAll: (_selected: boolean, selectedRows: Recordable[]) => {
-          pendingConfirmQueue.value = selectedRows;
+          selectedConfirmQueue.value = selectedRows;
         },
         },
       },
       },
     };
     };
@@ -266,7 +268,7 @@
     selectedTotal.value = unref(selectedTotal) - removeRowKeys.length;
     selectedTotal.value = unref(selectedTotal) - removeRowKeys.length;
 
 
     clearSelectedRowKeys();
     clearSelectedRowKeys();
-    pendingConfirmQueue.value = [];
+    selectedConfirmQueue.value = [];
     setProps({ dataSource: unref(selectedRows) });
     setProps({ dataSource: unref(selectedRows) });
     handleTriggerEmit(unref(selectedRowKeys), unref(selectedRows));
     handleTriggerEmit(unref(selectedRowKeys), unref(selectedRows));
 
 
@@ -380,7 +382,7 @@
                   <!-- <Button type="primary">全选</Button> -->
                   <!-- <Button type="primary">全选</Button> -->
                   <div class="text-blue-400">
                   <div class="text-blue-400">
                     <span class="mr-2">选择设备:</span>
                     <span class="mr-2">选择设备:</span>
-                    <span>{{ pendingConfirmQueue.length }}</span>
+                    <span>{{ selectedConfirmQueue.length }}</span>
                   </div>
                   </div>
                 </section>
                 </section>
               </template>
               </template>
@@ -388,7 +390,7 @@
             <section class="flex justify-end px-4 pb-4">
             <section class="flex justify-end px-4 pb-4">
               <Button
               <Button
                 type="primary"
                 type="primary"
-                :disabled="!pendingConfirmQueue.length"
+                :disabled="!selectedConfirmQueue.length"
                 @click="handleRemoveSelected"
                 @click="handleRemoveSelected"
               >
               >
                 <span>移除已选</span>
                 <span>移除已选</span>

@@ -8,7 +8,7 @@ class ApiFormPartialConfig {
   static restEndpointUrlPattern = 'http://localhost/api'; //端点URL模式
   static restEndpointUrlPattern = 'http://localhost/api'; //端点URL模式
   static requestMethod = 'POST'; //请求方式
   static requestMethod = 'POST'; //请求方式
   static proxyHost = true; //代理主机
   static proxyHost = true; //代理主机
-  static proxyPort = 0; //代理端口
+  static proxyPort = 1; //代理端口
   static maxParallelRequestsCount = 0; //最大并行请求数
   static maxParallelRequestsCount = 0; //最大并行请求数
   static readTimeoutMs = 0; //读取超时（毫秒）
   static readTimeoutMs = 0; //读取超时（毫秒）
   static maxQueueSize = 0; //Redis队列最大数
   static maxQueueSize = 0; //Redis队列最大数
@@ -99,8 +99,10 @@ export const modeApiForm: FormSchema[] = [
     component: 'InputNumber',
     component: 'InputNumber',
     defaultValue: ApiFormPartialConfig.proxyPort,
     defaultValue: ApiFormPartialConfig.proxyPort,
     componentProps: {
     componentProps: {
+      placeholder: '请输入代理端口',
       maxLength: 255,
       maxLength: 255,
-      placeholder: 'http或者https开头',
+      min: 1,
+      max: 65535,
     },
     },
     ifShow: ({ values }) => {
     ifShow: ({ values }) => {
       return !!values.enableProxy;
       return !!values.enableProxy;

@@ -84,27 +84,30 @@
 
 
   const handleSubmit = async (closeModalAfterSuccess = true) => {
   const handleSubmit = async (closeModalAfterSuccess = true) => {
     try {
     try {
-      closeModalAfterSuccess && setModalProps({ confirmLoading: true });
-      const getDataFlowMethod = await dataFlowMethodRef.value?.getValue();
-      const { name, description, ...getDataFlowParams } = await dataFlowParamsRef.value?.getValue();
-      removeFieldByModeForm.forEach((item) => {
-        Reflect.deleteProperty(getDataFlowParams, item);
-      });
-      validateOtherProperity(
-        getDataFlowParams?.headers,
-        getDataFlowParams?.otherProperties,
-        getDataFlowParams?.clientProperties
-      );
-      const data = getValue(description, name, getDataFlowMethod, getDataFlowParams);
-      const rest = await postAddConvertApi({ ...restData.data, ...data });
-      if (rest) {
-        closeModalAfterSuccess && createMessage.success(`${businessText.value}成功`);
-        closeModalAfterSuccess && closeModal();
-        closeModalAfterSuccess && resetValue();
-        //fix 弹窗关闭时闪动问题
-        setTimeout(() => {
-          emit('success');
-        }, 100);
+      if (closeModalAfterSuccess) {
+        closeModalAfterSuccess && setModalProps({ confirmLoading: true });
+        const getDataFlowMethod = await dataFlowMethodRef.value?.getValue();
+        const { name, description, ...getDataFlowParams } =
+          await dataFlowParamsRef.value?.getValue();
+        removeFieldByModeForm.forEach((item) => {
+          Reflect.deleteProperty(getDataFlowParams, item);
+        });
+        validateOtherProperity(
+          getDataFlowParams?.headers,
+          getDataFlowParams?.otherProperties,
+          getDataFlowParams?.clientProperties
+        );
+        const data = getValue(description, name, getDataFlowMethod, getDataFlowParams);
+        const rest = await postAddConvertApi({ ...restData.data, ...data });
+        if (rest) {
+          closeModalAfterSuccess && createMessage.success(`${businessText.value}成功`);
+          closeModalAfterSuccess && closeModal();
+          closeModalAfterSuccess && resetValue();
+          //fix 弹窗关闭时闪动问题
+          setTimeout(() => {
+            emit('success');
+          }, 100);
+        }
       }
       }
     } finally {
     } finally {
       setModalProps({ confirmLoading: false });
       setModalProps({ confirmLoading: false });