Merge remote-tracking branch 'origin/master'

src/views/auditLog/audiModaltab2.vue

@@ -16,7 +16,9 @@
   import { ModelFormSchematab2 } from './audiModal.data';
   import { getDeptList } from '@/api/system/dept/dept';
   import { addUserApi, UserDetailApi, UserUpdataApi } from '@/api/system/user/user';
+  import { encryptTwo } from '../../../../src/utils/jsencrypt.js';
   import { useMessage } from '@/hooks/web/useMessage';
+  import { TableData } from './mock';
   import { router } from '@/router';
 
   defineOptions({ name: 'ModelModal' });

src/views/auditLog/beforeOutputModal.vue

-<template>
-
-</template>
-
-<script>
-export default {
-  name: "beforeOutputModal"
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/dataQuality/dataSheet/task/QualityTaskRunSetting.data.ts

@@ -39,19 +39,43 @@ export const SearchFormSchema: FormSchema[] = [
 ];
 export const storageManagementColumns: BasicColumn[] = [
   {
-    title: '清理开始时间',
-    dataIndex: 'startTime',
+    title: '参数名',
+    dataIndex: 'parameterName',
     width: 120,
   },
   {
-    title: '清理结束时间',
-    dataIndex: 'endTime',
-    width: 120,
+    title: '参数类型',
+    dataIndex: 'parameterType',
+    edit: true,
+    editComponent: 'Select',
+    editComponentProps: {
+      options: [
+        {
+          label: '时间类',
+          value: '1',
+        },
+        {
+          label: '字符类',
+          value: '2',
+        },
+        {
+          label: '数值类',
+          value: '3',
+        },
+        {
+          label: '自定义类',
+          value: '4',
+        },
+      ],
+    },
+    width: 200,
   },
   {
-    title: '执行耗时',
-    dataIndex: 'useTime',
+    title: '参数值',
+    dataIndex: 'parameterValue',
     width: 80,
+    editable: true,
+    edit: true,
   },
 ];
 export const storageManagementFormSchema: FormSchema[] = [
@@ -62,7 +86,7 @@ export const storageManagementFormSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请输入关键字搜索',
     },
-    colProps: { lg: 4, md: 4 },
+    colProps: { lg: 8, md: 4 },
   },
 ];
 export const storageManagementData: any[] = [
@@ -76,6 +100,9 @@ export const storageManagementData: any[] = [
     pointNum: '5000',
     num: '2000',
     user: '张三',
+    parameterName: 'check_date',
+    parameterType: '字符类',
+    parameterValue: '参数值',
   },
   {
     id: '2',
@@ -87,6 +114,9 @@ export const storageManagementData: any[] = [
     pointNum: '7000',
     num: '3500',
     user: '李四',
+    parameterName: 'check_date',
+    parameterType: '时间类',
+    parameterValue: '参数值',
   },
   {
     id: '3',
@@ -98,6 +128,9 @@ export const storageManagementData: any[] = [
     pointNum: '6000',
     num: '3000',
     user: '王五',
+    parameterName: 'check_date',
+    parameterType: '数值类',
+    parameterValue: '参数值',
   },
   {
     id: '4',
@@ -109,6 +142,9 @@ export const storageManagementData: any[] = [
     pointNum: '4500',
     num: '2250',
     user: '赵六',
+    parameterName: 'check_date',
+    parameterType: '自定义类',
+    parameterValue: '参数值',
   },
   {
     id: '5',
@@ -120,5 +156,64 @@ export const storageManagementData: any[] = [
     pointNum: '5500',
     num: '2750',
     user: '孙七',
+    parameterName: 'check_date',
+    parameterType: '数值类',
+    parameterValue: '参数值',
+  },
+];
+export const storageManagementBasicFormSchema: FormSchema[] = [
+  {
+    field: 'field12',
+    component: 'BasicTitle',
+    label: '规则展示',
+    componentProps: {
+      // line: true,
+      span: true,
+    },
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    field: 'divider-linked',
+    component: 'Divider',
+    label: 'name日期逻辑正确',
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    field: 'field122',
+    component: 'InputTextArea',
+    label: '',
+    componentProps: {
+      disabled: true,
+      defaultValue:
+        'RESPONSE_DATA_SUCCESSFULLY_RECEIVED_FROM_SERVER_WITH_STATUS_CODE_200_AND_RESPONSE_BODY_CONTAINING_EXPECTED_DATA_IN_JSON_FORMAT_WITH_NO_ERRORS_OR_WARNINGS_DETECTED_IN_THE_PROCESSRESPONSE_DATA_SUCCESSFULLY_RECEIVED_FROM_SERVER_WITH_STATUS_CODE_200_AND_RESPONSE_BODY_CONTAINING_EXPECTED_DATA_IN_JSON_FORMAT_WITH_NO_ERRORS_OR_WARNINGS_DETECTED_IN_THE_PROCESSRESPONSE_DATA_SUCCESSFULLY_RECEIVED_FROM_SERVER_WITH_STATUS_CODE_200_AND_RESPONSE_BODY_CONTAINING_EXPECTED_DATA_IN_JSON_FORMAT_WITH_NO_ERRORS_OR_WARNINGS_DETECTED_IN_THE_PROCESS',
+    },
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    field: 'divider-linked',
+    component: 'Divider',
+    label: '创建日期逻辑',
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    field: 'field123',
+    component: 'InputTextArea',
+    label: '',
+    componentProps: {
+      disabled: true,
+      defaultValue:
+        'RESPONSE_DATA_SUCCESSFULLY_RECEIVED_FROM_SERVER_WITH_STATUS_CODE_200_AND_RESPONSE_BODY_CONTAINING_EXPECTED_DATA_IN_JSON_FORMAT_WITH_NO_ERRORS_OR_WARNINGS_DETECTED_IN_THE_PROCESSRESPONSE_DATA_SUCCESSFULLY_RECEIVED_FROM_SERVER_WITH_STATUS_CODE_200_AND_RESPONSE_BODY_CONTAINING_EXPECTED_DATA_IN_JSON_FORMAT_WITH_NO_ERRORS_OR_WARNINGS_DETECTED_IN_THE_PROCESSRESPONSE_DATA_SUCCESSFULLY_RECEIVED_FROM_SERVER_WITH_STATUS_CODE_200_AND_RESPONSE_BODY_CONTAINING_EXPECTED_DATA_IN_JSON_FORMAT_WITH_NO_ERRORS_OR_WARNINGS_DETECTED_IN_THE_PROCESS',
+    },
+    colProps: {
+      span: 24,
+    },
   },
 ];

src/views/dataQuality/dataSheet/task/QualityTaskRunSetting.vue

@@ -52,6 +52,7 @@
         </template>
       </template>
     </BasicTable>
+    <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -59,10 +60,12 @@
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { useMessage } from '@/hooks/web/useMessage';
   import { BasicTable, TableAction, useTable } from '@/components/Table';
+  import { BasicForm, useForm } from '@/components/Form';
   import {
     storageManagementColumns,
     storageManagementFormSchema,
     storageManagementData,
+    storageManagementBasicFormSchema,
   } from './QualityTaskRunSetting.data';
   // import { storageManagementData } from './analysisData';
   import { Tag } from 'ant-design-vue';
@@ -103,14 +106,14 @@
       autoSubmitOnEnter: true,
     },
     rowKey: 'id',
-    rowSelection: true,
+    // rowSelection: true,
     bordered: true,
     showIndexColumn: false,
-    actionColumn: {
-      width: 150,
-      title: '操作',
-      dataIndex: 'action',
-    },
+    // actionColumn: {
+    //   width: 150,
+    //   title: '操作',
+    //   dataIndex: 'action',
+    // },
   });
   //初始化弹框
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
@@ -118,7 +121,15 @@
     setModalProps({ confirmLoading: false });
     title.value = data.title;
   });
+  const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
+    labelWidth: 100,
 
+    schemas: storageManagementBasicFormSchema,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 23,
+    },
+  });
   async function handleSubmit() {
     closeModal();
   }