Merge branch 'dev_20241202_xukangle' into develop

@@ -764,8 +764,8 @@ export const createTableSql = (data) => request({
  * @param {no params}
  * @param {no params}
  * @path /cg-dir/export
  * @path /cg-dir/export
  */
  */
-export const exportCgDir = () => request({
-  url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/cg-dir/export`,
+export const exportCgDir = (params) => request({
+  url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/cg-dir/export?execGuid=${params.execGuid}`,
   method: 'post',
   method: 'post',
   responseType: 'blob',
   responseType: 'blob',
 })
 })
@@ -792,6 +792,21 @@ export const getDbDirDetail = (params) => request({
   method: 'get',
   method: 'get',
 })
 })
 
 
+/**
+ * 数据库目录修改规划数据资产
+ * @param {Object}
+ * @path /db-dir/table/update-data-asset
+ *
+ */
+
+export const updateDataAsset = (data) => request({
+  url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/db-dir/table/update-data-asset`,
+  method: 'post',
+  data
+})
+
+
+
 /*********************业务规则配置 ************数据库目录************************* */
 /*********************业务规则配置 ************数据库目录************************* */
 
 
 /**
 /**

@@ -235,8 +235,8 @@ const routes: RouteRecordRaw[] = [
           reuse: true
           reuse: true
         },
         },
         beforeEnter: (to, from) => {
         beforeEnter: (to, from) => {
-          if (to.query.domainName) {
-            to.meta.title = `已有表新建(${to.query.domainName})`;
+          if (to.query.editOpt) {
+            to.meta.title = `编辑-(${to.query.tableChName})`;
             to.meta.editPage = true;
             to.meta.editPage = true;
           }
           }
         }
         }

@@ -13,6 +13,7 @@ const fullPath = route.fullPath;
 const userStore = useUserStore();
 const userStore = useUserStore();
 const bizRuleConfigData = ref<any>()
 const bizRuleConfigData = ref<any>()
 const getBizRuleConfigDetailData = async () => {
 const getBizRuleConfigDetailData = async () => {
+  tableFieldsLoading.value = true
   const params = {
   const params = {
     tableGuid: router.currentRoute.value.query.tableGuid,
     tableGuid: router.currentRoute.value.query.tableGuid,
     execGuid: router.currentRoute.value.query.execGuid
     execGuid: router.currentRoute.value.query.execGuid
@@ -25,6 +26,7 @@ const getBizRuleConfigDetailData = async () => {
       item.isEdit = false
       item.isEdit = false
     })
     })
     tableData.value = bizRuleConfigData.value
     tableData.value = bizRuleConfigData.value
+    tableFieldsLoading.value = false
   } else {
   } else {
     proxy.$message.error(res.msg)
     proxy.$message.error(res.msg)
   }
   }

@@ -798,7 +798,7 @@ const positionOptions = [
 ];
 ];
 // 语言options
 // 语言options
 const languageOptions = [
 const languageOptions = [
-  { label: '中文名', value: 'zhName' },
+  { label: '中文名', value: 'chName' },
   { label: '英文名', value: 'enName' },
   { label: '英文名', value: 'enName' },
 ];
 ];
 // 当前悬停的行索引
 // 当前悬停的行索引