Merge remote-tracking branch 'origin/master'

src/views/mallResourceDevelopment/benchmark/benchmarkMainbody/addLabelModal.vue

@@ -20,7 +20,7 @@
   import { ref, unref } from 'vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
-  import { addTabFormSchema } from '@/views/mallResourceDevelopment/label/label.data';
+  import { addTabFormSchema } from '@/views/mallResourceDevelopment/label/label/label.data';
   import { Input } from 'ant-design-vue';
 
   const isUpdate = ref(false);

src/views/mallResourceDevelopment/benchmark/benchmarkMainbody/labelDetail/index.vue

@@ -71,11 +71,11 @@
     columnFormSchema,
     columnTableColumn,
     detailFormSchema,
-  } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
+  } from '@/views/mallResourceDevelopment/label/label/labelDetail/detail.data';
   import {
     columnTableData, gatherData,
     gatherDataTableHeader,
-  } from '@/views/mallResourceDevelopment/label/labelDetail/detailData';
+  } from '@/views/mallResourceDevelopment/label/label/labelDetail/detailData';
   import SensitiveWayModel from './sensitiveWayModel.vue';
   import { useModal } from '@/components/Modal';
   import InfoModel from './infoModel.vue';

src/views/mallResourceDevelopment/benchmark/benchmarkMainbody/labelDetail/infoModel.vue

@@ -21,7 +21,7 @@
   import { Input } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
-  import { infoFormSchema } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
+  import { infoFormSchema } from '@/views/mallResourceDevelopment/label/label/labelDetail/detail.data';
 
   const isUpdate = ref(false);
   const getTitle = '基本信息';

src/views/mallResourceDevelopment/benchmark/benchmarkMainbody/labelDetail/sensitiveWayModel.vue

@@ -39,13 +39,13 @@
   import { BasicForm, useForm } from '@/components/Form';
   import { BasicTable, useTable, TableAction, BasicTableProps } from '@/components/Table';
   import { useMessage } from '@/hooks/web/useMessage';
-  import { tabTableData } from '@/views/mallResourceDevelopment/label/labelData';
+  import { tabTableData } from '@/views/mallResourceDevelopment/label/label/labelData';
   import {
     tabTableColumn,
     tabTableFormSchema,
-  } from '@/views/mallResourceDevelopment/label/label.data';
-  import { sensitiveTableColumn } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
-  import { columnTableData } from '@/views/mallResourceDevelopment/label/labelDetail/detailData';
+  } from '@/views/mallResourceDevelopment/label/label/label.data';
+  import { sensitiveTableColumn } from '@/views/mallResourceDevelopment/label/label/labelDetail/detail.data';
+  import { columnTableData } from '@/views/mallResourceDevelopment/label/label/labelDetail/detailData';
   import BasicHelp from '@/components/Basic/src/BasicHelp.vue';
 
   const getTitle = '脱敏策略';

src/views/mallResourceDevelopment/labelDevelop/group/addGroup/index.vue → src/views/mallResourceDevelopment/label/group/addGroup/index.vue

@@ -97,13 +97,13 @@
     bottomFormSchema,
     rangeTableColumn,
     topFormSchema,
-  } from '@/views/mallResourceDevelopment/labelDevelop/group/addGroup/add.data';
+  } from '@/views/mallResourceDevelopment/label/group/addGroup/add.data';
   import { BaseFormatProps } from 'vue-i18n';
   import { ref } from 'vue';
   import BasicTable from '@/components/Table/src/BasicTable.vue';
   import { useTable } from '@/components/Table';
   import { getMetadataColumns } from '@/views/dataIntegration/dataLoading/dataEntryLake/offlineLoading.data';
-  import { rangeTableData } from '@/views/mallResourceDevelopment/labelDevelop/group/addGroup/addData';
+  import { rangeTableData } from '@/views/mallResourceDevelopment/label/group/addGroup/addData';
 
   const visibleRangeOptions = [
     {

src/views/mallResourceDevelopment/labelDevelop/group/index.vue → src/views/mallResourceDevelopment/label/group/index.vue

@@ -78,7 +78,7 @@
   import {
     gourpTableFormSchema,
     groupTableColumn,
-  } from '@/views/mallResourceDevelopment/labelDevelop/group/group.data';
+  } from '@/views/mallResourceDevelopment/label/group/group.data';
   import { FormProps } from 'ant-design-vue';
   import { cloneDeep } from 'lodash-es';
   import {useRouter} from "vue-router";
@@ -96,7 +96,7 @@
   const router = useRouter();
   function handleNewDataGroup() {
     router.push({
-      path: '/mallResourceDevelopment/labelDevelop/group/addGroup',
+      path: '/mallResourceDevelopment/label/group/addGroup',
     });
   }
   function handleSelect() {

src/views/mallResourceDevelopment/label/addLabelModal.vue → src/views/mallResourceDevelopment/label/label/addLabelModal.vue

@@ -20,7 +20,7 @@
   import { ref, unref } from 'vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
-  import { addTabFormSchema } from '@/views/mallResourceDevelopment/label/label.data';
+  import { addTabFormSchema } from '@/views/mallResourceDevelopment/label/label/label.data';
   import { Input } from 'ant-design-vue';
 
   const isUpdate = ref(false);

src/views/mallResourceDevelopment/label/index.vue → src/views/mallResourceDevelopment/label/label/index.vue

@@ -108,8 +108,8 @@
   import { h, ref, unref } from 'vue';
   import { Divider } from 'ant-design-vue';
   import type { BasicTableProps, TableActionType } from '@/components/Table';
-  import PageWrapper from '../../../components/Page/src/PageWrapper.vue';
-  import BasicTree from '../../../components/Tree/src/BasicTree.vue';
+  import PageWrapper from '../../../../components/Page/src/PageWrapper.vue';
+  import BasicTree from '../../../../components/Tree/src/BasicTree.vue';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { TreeActionItem } from '@/components/Tree';
   import { tableListViewThree } from '@/views/dataQuality/agentClass/global/details/setup/mock';
@@ -117,7 +117,7 @@
   import {
     tabTableColumn,
     tabTableFormSchema,
-  } from '@/views/mallResourceDevelopment/label/label.data';
+  } from '@/views/mallResourceDevelopment/label/label/label.data';
   import { searchFormSchema } from '@/views/auditLog/audi.data';
   import { useMessage } from '@/hooks/web/useMessage';
   import { useRoute, useRouter } from 'vue-router';
@@ -189,7 +189,7 @@
   function handleBody(record) {
     console.log('recode', record);
     router.push({
-      path: '/mallResourceDevelopment/label/labelDetail',
+      path: '/mallResourceDevelopment/label/label/labelDetail',
       query: { ...record },
     });
   }

src/views/mallResourceDevelopment/label/labelDetail/index.vue → src/views/mallResourceDevelopment/label/label/labelDetail/index.vue

@@ -60,7 +60,7 @@
 <script lang="ts" setup>
   import { Input, InputSearch, Select, TabPane, Tabs } from 'ant-design-vue';
   import { SlidersOutlined } from '@ant-design/icons-vue';
-  import PageWrapper from '../../../../components/Page/src/PageWrapper.vue';
+  import PageWrapper from '../../../../../components/Page/src/PageWrapper.vue';
   import { useRoute } from 'vue-router';
   import BasicForm from '@/components/Form/src/BasicForm.vue';
   import { useForm } from '@/components/Form';
@@ -71,11 +71,11 @@
     columnFormSchema,
     columnTableColumn,
     detailFormSchema,
-  } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
+  } from '@/views/mallResourceDevelopment/label/label/labelDetail/detail.data';
   import {
     columnTableData, gatherData,
     gatherDataTableHeader,
-  } from '@/views/mallResourceDevelopment/label/labelDetail/detailData';
+  } from '@/views/mallResourceDevelopment/label/label/labelDetail/detailData';
   import SensitiveWayModel from './sensitiveWayModel.vue';
   import { useModal } from '@/components/Modal';
   import InfoModel from './infoModel.vue';

src/views/mallResourceDevelopment/label/labelDetail/infoModel.vue → src/views/mallResourceDevelopment/label/label/labelDetail/infoModel.vue

@@ -21,7 +21,7 @@
   import { Input } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
-  import { infoFormSchema } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
+  import { infoFormSchema } from '@/views/mallResourceDevelopment/label/label/labelDetail/detail.data';
 
   const isUpdate = ref(false);
   const getTitle = '基本信息';

src/views/mallResourceDevelopment/label/labelDetail/sensitiveWayModel.vue → src/views/mallResourceDevelopment/label/label/labelDetail/sensitiveWayModel.vue

@@ -39,13 +39,13 @@
   import { BasicForm, useForm } from '@/components/Form';
   import { BasicTable, useTable, TableAction, BasicTableProps } from '@/components/Table';
   import { useMessage } from '@/hooks/web/useMessage';
-  import { tabTableData } from '@/views/mallResourceDevelopment/label/labelData';
+  import { tabTableData } from '@/views/mallResourceDevelopment/label/label/labelData';
   import {
     tabTableColumn,
     tabTableFormSchema,
-  } from '@/views/mallResourceDevelopment/label/label.data';
-  import { sensitiveTableColumn } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
-  import { columnTableData } from '@/views/mallResourceDevelopment/label/labelDetail/detailData';
+  } from '@/views/mallResourceDevelopment/label/label/label.data';
+  import { sensitiveTableColumn } from '@/views/mallResourceDevelopment/label/label/labelDetail/detail.data';
+  import { columnTableData } from '@/views/mallResourceDevelopment/label/label/labelDetail/detailData';
   import BasicHelp from '@/components/Basic/src/BasicHelp.vue';
 
   const getTitle = '脱敏策略';

src/views/mallResourceDevelopment/labelDevelop/atomLabel/index.vue → src/views/mallResourceDevelopment/label/labelDevelop/atomLabel/index.vue

@@ -25,14 +25,14 @@
 
 <script lang="ts" setup>
   import { Input, Select } from 'ant-design-vue';
-  import PageWrapper from '../../../../components/Page/src/PageWrapper.vue';
+  import PageWrapper from '../../../../../components/Page/src/PageWrapper.vue';
   import BasicTable from '@/components/Table/src/BasicTable.vue';
   import { BasicTableProps, useTable } from '@/components/Table';
   import {
     atomFormSchema,
     atomTableColumn,
-  } from '@/views/mallResourceDevelopment/labelDevelop/atomLabel/atom.data';
-  import { atomTableData } from '@/views/mallResourceDevelopment/labelDevelop/atomLabel/atomData';
+  } from '@/views/mallResourceDevelopment/label/labelDevelop/atomLabel/atom.data';
+  import { atomTableData } from '@/views/mallResourceDevelopment/label/labelDevelop/atomLabel/atomData';
 
   function hasSelect(record) {
     return getAtomSelectKeys().includes(record.businessId);

src/views/mallResourceDevelopment/labelDevelop/createLabel/index.vue → src/views/mallResourceDevelopment/label/labelDevelop/createLabel/index.vue

@@ -84,7 +84,7 @@
                       v-if="!['是NULL', '不是NULL', null, undefined].includes(item.operator)"
                       v-model:value="item.des"
                     />
-                    <CloseOutlined @click="handleDel(item, item.key)" />
+                    <CloseOutlined @click="handleDel(group.fieldList, item.key)" />
                   </div>
                 </div>
                 <div class="flex">
@@ -111,7 +111,7 @@
 </template>
 
 <script lang="ts" setup>
-  import PageWrapper from '../../../../components/Page/src/PageWrapper.vue';
+  import PageWrapper from '../../../../../components/Page/src/PageWrapper.vue';
   import { Divider, List, Select, Input } from 'ant-design-vue';
   import { PlusOutlined, CloseOutlined } from '@ant-design/icons-vue';
   import { tabList } from './createData';
@@ -121,7 +121,7 @@
   import {
     createBodyFormSchema,
     createHeaderFormSchema,
-  } from '@/views/mallResourceDevelopment/labelDevelop/createLabel/create.data';
+  } from '@/views/mallResourceDevelopment/label/labelDevelop/createLabel/create.data';
   import { reactive, ref } from 'vue';
   import { useRoute } from 'vue-router';
 

src/views/mallResourceDevelopment/labelDevelop/index.vue → src/views/mallResourceDevelopment/label/labelDevelop/index.vue

@@ -70,9 +70,9 @@
 </template>
 
 <script lang="ts" setup>
-  import PageWrapper from '../../../components/Page/src/PageWrapper.vue';
-  import BasicTable from '../../../components/Table/src/BasicTable.vue';
-  import BasicTree from '../../../components/Tree/src/BasicTree.vue';
+  import PageWrapper from '../../../../components/Page/src/PageWrapper.vue';
+  import BasicTable from '../../../../components/Table/src/BasicTable.vue';
+  import BasicTree from '../../../../components/Tree/src/BasicTree.vue';
   import {computed, ref, unref} from 'vue';
   import { labelTreeData } from './labelData';
   import TableAction from '@/components/Table/src/components/TableAction.vue';
@@ -117,12 +117,12 @@
   const router = useRouter();
   function handleAtomLabel() {
     router.push({
-      path: '/mallResourceDevelopment/labelDevelop/atomLabel',
+      path: '/mallResourceDevelopment/label/labelDevelop/atomLabel',
     });
   }
   function handleAddLabel() {
     router.push({
-      path: '/mallResourceDevelopment/labelDevelop/createLabel',
+      path: '/mallResourceDevelopment/label/labelDevelop/createLabel',
       query: {
         name: tabName.value,
       },