Merge branch 'ft' into 'main_dev'

pref: 移除脚本管理中的是否保留原始数据

See merge request yunteng/thingskit-front!566

@@ -36,6 +36,7 @@ enum Api {
   setTenantProfile = '/tenantProfile',
   setTenantProfile = '/tenantProfile',
   getTenantPageList = '/admin/all/tenants',
   getTenantPageList = '/admin/all/tenants',
   getTenantAllPageList = '/admin/',
   getTenantAllPageList = '/admin/',
+  deleteTenantProfileByCheckPass = '/tenant_profiles/allow/',
 }
 }
 
 
 export async function deleteTenantProfileApi(ids: string) {
 export async function deleteTenantProfileApi(ids: string) {
@@ -169,3 +170,8 @@ export function getTenantAllPageLists(tenantId) {
     url: `${Api.getTenantAllPageList}${tenantId}/all/tenant_admin`,
     url: `${Api.getTenantAllPageList}${tenantId}/all/tenant_admin`,
   });
   });
 }
 }
+export function deleteTenantProfileByCheckPassApi(tenantProfileId) {
+  return defHttp.get({
+    url: `${Api.deleteTenantProfileByCheckPass}${tenantProfileId}/delete`,
+  });
+}

@@ -46,15 +46,6 @@
           />
           />
         </a-space>
         </a-space>
       </a-form-item>
       </a-form-item>
-      <a-form-item
-        label="保存原始数据"
-        name="saveOriginalData"
-        :rules="[{ required: true, message: '请选择保存原始数据' }]"
-      >
-        <a-space direction="vertical">
-          <a-radio-group v-model:value="scriptForm.saveOriginalData" :options="originalOptions" />
-        </a-space>
-      </a-form-item>
       <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
       <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
         <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
         <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
           <template #extra>
           <template #extra>
@@ -111,7 +102,7 @@
   </div>
   </div>
 </template>
 </template>
 <script setup lang="ts">
 <script setup lang="ts">
-  import { ref, unref, reactive, onMounted, toRefs, nextTick, computed } from 'vue';
+  import { ref, unref, reactive, onMounted, toRefs, computed } from 'vue';
   import ace from 'ace-builds';
   import ace from 'ace-builds';
   import { Card, Button, Tooltip } from 'ant-design-vue';
   import { Card, Button, Tooltip } from 'ant-design-vue';
   import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题
   import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题
@@ -149,15 +140,13 @@
     params: '',
     params: '',
     output: '',
     output: '',
     scriptType: 'TRANSPORT_TCP_UP',
     scriptType: 'TRANSPORT_TCP_UP',
-    saveOriginalData: 'true',
   });
   });
 
 
   const reportTypeOptions = reactive({
   const reportTypeOptions = reactive({
-    originalOptions: [],
     scriptTypeOptions: [],
     scriptTypeOptions: [],
   });
   });
 
 
-  const { originalOptions, scriptTypeOptions } = toRefs(reportTypeOptions);
+  const { scriptTypeOptions } = toRefs(reportTypeOptions);
 
 
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
 
 
@@ -171,8 +160,7 @@
 
 
   const getAceClass = computed((): string => userStore.getDarkMode);
   const getAceClass = computed((): string => userStore.getDarkMode);
 
 
-  const setDefaultRadio = (p2, p3) => {
-    scriptForm.saveOriginalData = p2;
+  const setDefaultRadio = (p3) => {
     scriptForm.scriptType = p3;
     scriptForm.scriptType = p3;
   };
   };
 
 
@@ -186,7 +174,6 @@
   };
   };
 
 
   onMounted(async () => {
   onMounted(async () => {
-    reportTypeOptions.originalOptions = (await getDictValue('original_data')) as never as any;
     reportTypeOptions.scriptTypeOptions = (await getDictValue('script_type')) as never as any;
     reportTypeOptions.scriptTypeOptions = (await getDictValue('script_type')) as never as any;
   });
   });
 
 
@@ -273,7 +260,6 @@
       ...value,
       ...value,
       ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null },
       ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null },
       ...{ script: !props.ifAdd ? scriptForm.script : null },
       ...{ script: !props.ifAdd ? scriptForm.script : null },
-      ...{ saveOriginalData: scriptForm.saveOriginalData === 'false' ? false : true },
     };
     };
   };
   };
 
 
@@ -293,11 +279,6 @@
       for (let i in scriptForm) {
       for (let i in scriptForm) {
         Reflect.set(scriptForm, i, v[i]);
         Reflect.set(scriptForm, i, v[i]);
       }
       }
-      nextTick(() => {
-        setTimeout(() => {
-          scriptForm.saveOriginalData = v.saveOriginalData === false ? 'false' : 'true';
-        }, 10);
-      });
       aceEditor.value.setValue(v.convertJs);
       aceEditor.value.setValue(v.convertJs);
       handleFormat();
       handleFormat();
     }
     }

@@ -62,7 +62,7 @@
           : '测试转换脚本';
           : '测试转换脚本';
       const okText = isText.value == 'test' ? '测试' : '确定';
       const okText = isText.value == 'test' ? '测试' : '确定';
       if (unref(isTitle) == 'add') {
       if (unref(isTitle) == 'add') {
-        converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP');
+        converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
       }
       }
       if (unref(isTitle) == 'edit') {
       if (unref(isTitle) == 'edit') {
         converScriptRef.value?.setFormData(data.record);
         converScriptRef.value?.setFormData(data.record);
@@ -72,7 +72,7 @@
           const res = await getScriptManageDetail(data.record);
           const res = await getScriptManageDetail(data.record);
           converScriptRef.value?.setFormData(res);
           converScriptRef.value?.setFormData(res);
         } else {
         } else {
-          converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP');
+          converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
         }
         }
       }
       }
       setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });
       setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });

@@ -62,7 +62,7 @@
           : '测试转换脚本';
           : '测试转换脚本';
       const okText = isText.value == 'test' ? '测试' : '确定';
       const okText = isText.value == 'test' ? '测试' : '确定';
       if (unref(isTitle) == 'add') {
       if (unref(isTitle) == 'add') {
-        converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP');
+        converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
       }
       }
       if (unref(isTitle) == 'edit') {
       if (unref(isTitle) == 'edit') {
         converScriptRef.value?.setFormData(data.record);
         converScriptRef.value?.setFormData(data.record);
@@ -73,7 +73,7 @@
           converScriptRef.value?.setFormData({ ...res, convertJs: data?.testContent });
           converScriptRef.value?.setFormData({ ...res, convertJs: data?.testContent });
         } else {
         } else {
           converScriptRef.value?.setFormData({ convertJs: data?.testContent });
           converScriptRef.value?.setFormData({ convertJs: data?.testContent });
-          converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP');
+          converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
         }
         }
       }
       }
       setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });
       setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });

@@ -69,6 +69,7 @@
     getTableTenantProfileApi,
     getTableTenantProfileApi,
     deleteTenantProfileApi,
     deleteTenantProfileApi,
     setTenantProfileIsDefaultApi,
     setTenantProfileIsDefaultApi,
+    deleteTenantProfileByCheckPassApi,
   } from '/@/api/tenant/tenantApi';
   } from '/@/api/tenant/tenantApi';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
@@ -118,10 +119,15 @@
         echoEditData = record;
         echoEditData = record;
       }
       }
       async function handleDelete(record: Recordable) {
       async function handleDelete(record: Recordable) {
-        let ids = record.id.id;
-        await deleteTenantProfileApi(ids);
-        createMessage.success('删除成功');
-        reload();
+        const { data, message } = await deleteTenantProfileByCheckPassApi(record?.id?.id);
+        if (data) {
+          let ids = record?.id?.id;
+          await deleteTenantProfileApi(ids);
+          createMessage.success('删除成功');
+          reload();
+        } else {
+          createMessage.warning(message);
+        }
       }
       }
       const useSelectionChange = () => {
       const useSelectionChange = () => {
         selectedRowKeys = getSelectRows();
         selectedRowKeys = getSelectRows();