Merge remote-tracking branch 'origin/master'

src/views/mallResourceDevelopment/API/publicAPI/editModal.vue

@@ -154,12 +154,13 @@
     descriptionData.value = cardList.filter((item) => item.title === data.title);
     console.log('descriptionData.value', descriptionData.value);
     setModalProps({ confirmLoading: false });
+    setDescProps({ data: descriptionData.value[0] });
   });
   const [
     registerApplyForPushNotificationsModal,
     { openModal: openApplyForPushNotificationsModal },
   ] = useModal();
-  const [register1] = useDescription({
+  const [register1, { setDescProps }] = useDescription({
     bordered: false,
     data: descriptionData.value[0],
     schema: schema,

src/views/mallResourceDevelopment/dataSet/commonDataSet/editModal.vue

@@ -152,14 +152,16 @@
     setModalProps({ confirmLoading: true });
     title.value = data.title;
     descriptionData.value = cardList.filter((item) => item.title === data.title);
-    console.log('descriptionData.value', descriptionData.value);
+    console.log('data', data)
+    console.log('descriptionData.value', descriptionData.value[0]);
     setModalProps({ confirmLoading: false });
+    setDescProps({ data: descriptionData.value[0] });
   });
   const [
     registerApplyForPushNotificationsModal,
     { openModal: openApplyForPushNotificationsModal },
   ] = useModal();
-  const [register1] = useDescription({
+  const [register1, { setDescProps }] = useDescription({
     bordered: false,
     data: descriptionData.value[0],
     schema: schema,

src/views/mallResourceDevelopment/dataSet/commonDataSet/index.vue

@@ -265,6 +265,10 @@
     // console.log(node);
     workSpaceName.value = node.workSpaceName;
     if ([101, 102].includes(node.parentId)) {
+      openEditModal(
+        true,
+        cardList.find((item) => item.title === node.workSpaceName),
+      );
       //跳转详情页
     } else {
       onSearch();

src/views/mallResourceDevelopment/dataSet/commonDataSet/mock.ts

@@ -169,51 +169,6 @@ export const TreeData: any[] = [
     createTime: '2024-10-24 10:04:04',
     createBy: 'admin',
   },
-  {
-    delFlag: '0',
-    flag: '1',
-    businessId: 206,
-    parentWorkSpaceName: '党建建设',
-    workSpaceName: '红色文化展览',
-    parentId: 101,
-    'code:': '003',
-    ancestors: '0,100',
-    orderNum: 1,
-    children: [],
-    selectType: null,
-    createTime: '2024-10-24 10:04:04',
-    createBy: 'admin',
-  },
-  {
-    delFlag: '0',
-    flag: '1',
-    businessId: 207,
-    parentWorkSpaceName: '党建建设',
-    workSpaceName: '志愿服务活动',
-    parentId: 101,
-    'code:': '003',
-    ancestors: '0,100',
-    orderNum: 1,
-    children: [],
-    selectType: null,
-    createTime: '2024-10-24 10:04:04',
-    createBy: 'admin',
-  },
-  {
-    delFlag: '0',
-    flag: '1',
-    businessId: 208,
-    parentWorkSpaceName: '党建建设',
-    workSpaceName: '党员风采展示',
-    parentId: 101,
-    'code:': '003',
-    ancestors: '0,100',
-    orderNum: 1,
-    children: [],
-    selectType: null,
-    createTime: '2024-10-24 10:04:04',
-    createBy: 'admin',
-  },
   {
     delFlag: '0',
     flag: '1',

src/views/realTimeSync/dataBaseToDataBase/optionPage.vue

@@ -122,14 +122,14 @@
                 <a-button @click="handleGetMetadata('preview')" type="primary">预览</a-button>
               </template>
             </BasicForm>
-            <div v-if="tableDetail" style="width: 40%; padding: 0 5px 5px">
+            <div v-if="tableDetail" style="width: 40%; padding: 0 5px 5px; margin-left: 20px">
               <div class="title">已获取元数据</div>
               <div style="display: flex; justify-content: space-between">
                 <a-input-search style="width: 220px" />
               </div>
               <BasicTable @register="registerDataSourceTable" />
             </div>
-            <div v-if="tableDetail" style="width: 40%; padding: 0 5px 5px">
+            <div v-if="tableDetail" style="width: 40%; padding: 0 5px 5px; margin-left: 20px">
               <div class="title">唯一键</div>
               <Alert
                 show-icon
@@ -209,7 +209,11 @@
                   :actions="[
                     {
                       icon: 'ic:outline-delete-outline',
-                      onClick: handleDeleteRule.bind(null, record),
+                      popConfirm: {
+                        title: '是否确认删除',
+                        placement: 'left',
+                        confirm: handleDeleteRule.bind(null, record),
+                      },
                     },
                   ]"
                 />
@@ -852,6 +856,7 @@
     },
   });
   const [registerMappingRuleConfigurationTable, { getRowSelection, reload }] = useTable({
+    title: ' ',
     api: async () => {
       const response = {
         pageNu: '1',
@@ -1274,6 +1279,12 @@
     reload();
   }
 
+  function handleOperation() {
+    router.push({
+      path: '/dataIntegration/taskOM/index',
+    });
+  }
+
   function handleMoveTop(source) {
     [mappingRuleConfigurationTable.value[source], mappingRuleConfigurationTable.value[0]] = [
       mappingRuleConfigurationTable.value[0],

src/views/scriptDevelopment/functionManagement/index.vue

@@ -13,7 +13,7 @@
         <div style="margin-left: 10px">
           <span class="title">test</span>
           <div>
-            <span class="path">自助建表文件/test</span>
+            <span class="path">函数/test</span>
           </div>
         </div>
         <a-button style="margin-left: 700px" type="primary" @click="handleDeleteIds">删除</a-button>