Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -404,7 +404,137 @@ export const getSankeyData = (guid) =>  request({
 
 
 /** 数仓目录树列表查询 */
 /** 数仓目录树列表查询 */
 export const getDataWareCatalogList = (params) => request({
 export const getDataWareCatalogList = (params) => request({
-    url: `${import.meta.env.VITE_APP_DATA_DELIVERY}delivery/ms-daop-data-plan-service/data-catalog-directory/tree-list`,
+   // url: `${import.meta.env.VITE_APP_DATA_DELIVERY}delivery/ms-daop-data-plan-service/data-catalog-directory/tree-list`,
+   url: `http://localhost:9000/delivery/ms-daop-data-plan-service/data-catalog-directory/tree-list`,
     method: 'post',
     method: 'post',
     data: params
     data: params
 })
 })
+
+export const getAllFlowData = (dictType) => request({
+    url: `${import.meta.env.VITE_APP_CONFIG_URL}/dict/data/get-by-dictType?dictType=${dictType}`,
+    method: 'get',
+})
+
+/** 元数据标准guid查询新建数据集字段 */
+export const getMetaStandardDsField = (guid) => request({
+  url: `${import.meta.env.VITE_APP_STANDARD_URL}/meta-standard/get-standard?metaStandardGuid=${guid}`,
+  method: 'get'
+})
+
+/** 表分类类型 */
+export const tableCategoryList = [
+    {
+      value: 1,
+      label: "明细表",
+    },
+    {
+      value: 2,
+      label: "汇总表",
+    },
+    {
+      value: 3,
+      label: "应用表",
+    },
+    {
+      value: 6,
+      label: "业务表",
+    },
+    // {
+    //   value: 4,
+    //   label: "维度表",
+    // },
+    // {
+    //   value: 5,
+    //   label: "缓慢变化维",
+    // }
+];
+
+/** 同步策略 */
+export const syncPolicys = [
+    {
+      value: 1,
+      label: "实时",
+    },
+    {
+      value: 2,
+      label: "增量",
+    },
+    {
+      value: 3,
+      label: "全量",
+    },
+    {
+      value: 4,
+      label: "增量加更新",
+    },
+];
+
+/** 维表类型 */
+export const dimTypeList = [{
+  label: "列表",
+  value: 1,
+},
+{
+  label: "层级",
+  value: 2,
+},
+{
+  label: "螺旋",
+  value: 3,
+},
+{
+  label: "通用",
+  value: 4,
+}];
+
+/** 表模型分类 */
+export const tableModels = [
+    {
+      label: "主键模型",
+      value: 1,
+    },
+    {
+      label: "聚合模型",
+      value: 2,
+    },
+    {
+      label: "明细模型",
+      value: 3,
+    }
+];
+  
+  /** 聚合方式 */
+export  const aggMethodList = [{
+    value: 'SUM',
+  }, {
+    value: 'MAX'
+  }, {
+    value: 'MIN'
+  }, {
+    value: 'REPLACE'
+  }, {
+    value: 'REPLACE_IF_NOT_NULL'
+  }, {
+    value: 'HLL_UNION'
+  }, {
+    value: 'BITMAP_UNION'
+  }];
+
+  /** 保存主题表设置，直接入库 */
+export const saveSubjectTable = (params) => request({
+    url: `http://localhost:9000/delivery/ms-daop-data-plan-service/data-catalog-subject/add`,
+    method: 'post',
+    data: params
+})
+
+/** 获取字典列表 */
+export const getDictionary = (params) => request({
+    url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/data-dictionary-general/list-all?state=1`,
+    method: 'post'
+})
+
+/** 获取维度列表 */
+export const getDimList = () => request({
+  url: `http://localhost:9000/delivery/ms-daop-data-plan-service/data-catalog-subject/get-dim-list`,
+  method: 'get'
+})
\ No newline at end of file

@@ -4,7 +4,7 @@
       <div class="title">{{ detailInfoLabel }}</div>
       <div class="title">{{ detailInfoLabel }}</div>
       <div class="row" v-for="item in Object.keys(detailInfo)">
       <div class="row" v-for="item in Object.keys(detailInfo)">
         <span>{{ item + '：' }}</span>
         <span>{{ item + '：' }}</span>
-        <span>{{ detailInfo[item] }}</span>
+        <span>{{ detailInfo[item] == null ? '-' :  detailInfo[item] }}</span>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
@@ -37,6 +37,10 @@ const emits = defineEmits([
 
 
 const { proxy } = getCurrentInstance() as any;
 const { proxy } = getCurrentInstance() as any;
 
 
+const maxChineseCount = ref(14);
+
+const maxEnglishCount = ref(26);
+
 const detailLoading = ref(false);
 const detailLoading = ref(false);
 
 
 const detailInfo: any = ref({});
 const detailInfo: any = ref({});
@@ -116,9 +120,9 @@ const detectLanguage = (text) => {
 
 
 const handleLabelLength = (label: string) => {
 const handleLabelLength = (label: string) => {
   if (detectLanguage(label) == 'English') {
   if (detectLanguage(label) == 'English') {
-    return label?.length > 30 ? label.slice(0, 30) + '...' : label;
+    return label?.length > maxEnglishCount.value ? label.slice(0,  maxEnglishCount.value) + '...' : label;
   }
   }
-  return label?.length > 16 ? label.slice(0, 16) + '...' : label;
+  return label?.length > maxChineseCount.value ? label.slice(0, maxChineseCount.value) + '...' : label;
 };
 };
 
 
 insertCss(`
 insertCss(`
@@ -161,9 +165,9 @@ const initGraph = () => {
       const name = item._cfg.model?.label;
       const name = item._cfg.model?.label;
       if (currentAnchor == 'text-shape') {
       if (currentAnchor == 'text-shape') {
         if (detectLanguage(name) == 'English') {
         if (detectLanguage(name) == 'English') {
-          return name?.length > 30;
+          return name?.length > maxEnglishCount.value;
         }
         }
-        return name?.length > 16;
+        return name?.length > maxChineseCount.value;
       }
       }
       return false;
       return false;
     },
     },
@@ -300,8 +304,9 @@ const initGraph = () => {
       labelCfg: {
       labelCfg: {
         offset: 10,
         offset: 10,
         style: {
         style: {
-          fontSize: 16,
+          fontSize: 13,
           fill: '#212121',
           fill: '#212121',
+          fontWeight: 500
         },
         },
         position: !node.isField ? 'left' : 'right', //只有字段是最后一层级，不需要展开
         position: !node.isField ? 'left' : 'right', //只有字段是最后一层级，不需要展开
       },
       },

@@ -221,6 +221,44 @@ const routes: RouteRecordRaw[] = [
         }
         }
       },
       },
           {
           {
+        path: 'table-create-manual',
+        name: 'tableCreateManual',
+        component: () => import('@/views/data_meta/tableCreateManual.vue'),
+        meta: {
+          title: '新建表',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+          reuse: true,
+          activeMenu: '/data-meta/metadata-standard/standard-query'
+        },
+        beforeEnter: (to, from) => {
+          if (to.query.domainName) {
+            to.meta.title = `新建表(${to.query.domainName})-${to.query.standardName}`;
+            to.meta.editPage = true;
+          }
+        }
+      },
+       {
+        path: 'dim-table-create-manual',
+        name: 'dimTableCreateManual',
+        component: () => import('@/views/data_meta/dimTableCreateManual.vue'),
+        meta: {
+          title: '新建表',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+          reuse: true,
+          activeMenu: '/data-meta/metadata-standard/standard-query'
+        },
+        beforeEnter: (to, from) => {
+          if (to.query.domainName) {
+            to.meta.title = `新建表(${to.query.domainName})-${to.query.standardName}`;
+            to.meta.editPage = true;
+          }
+        }
+       },
+      {
         path: 'standard-codetable',
         path: 'standard-codetable',
         name: 'metadataStandardCodetable',
         name: 'metadataStandardCodetable',
         component: () => import('@/views/data_meta/standard-codetable.vue'),
         component: () => import('@/views/data_meta/standard-codetable.vue'),

+<template>
+  <el-select v-if="!readonly && isEdit && isSelectType(dbType, scope)" v-model="scope.row['defaultValue']" placeholder="请选择" collapse-tags-tooltip
+    filterable allow-create default-first-option :reserve-keyword="false">
+    <el-option v-for="opt in optionsConfig[dataType]" :key="opt['value']" :label="opt['label']" :value="opt['value']" />
+  </el-select>
+  <el-date-picker v-else-if="!readonly && isEdit && dataType === 'date'" v-model="scope.row['defaultValue']" type="date"
+    format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" />
+  <el-date-picker v-else-if="!readonly && isEdit && dbType === 'mysql' && dataType === 'datetime'"
+    v-model="scope.row['defaultValue']" placeholder="请选择" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+    value-format="YYYY-MM-DD HH:mm:ss" />
+  <el-input v-else-if="!readonly && isEdit" v-model.trim="scope.row['defaultValue']" placeholder="请填写"
+    @input="(val) => inputChange(val, scope.row.dataType, scope)" />
+  <span v-else>{{ scope.row["defaultValue"] == null ? '-' : (isSelectType(dbType, scope) ?
+    (optionsConfig[dataType].find(s => s.value == scope.row["defaultValue"])?.label ??
+      scope.row["defaultValue"]) : scope.row["defaultValue"]) }}</span>
+</template>
+
+<script lang="ts" setup name="tableDefaultValue">
+import { ref } from "vue";
+import { useDefault } from "@/hooks/useDefault";
+const { optionsConfig, inputChange, isSelectType } = useDefault()
+
+const props = defineProps({
+  dbType: {
+    type: String,
+    default: ''
+  },
+  scope: {
+    type: Object,
+    default: {}
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const isEdit = computed(() => {
+  return props.scope.row['isEdit'];
+});
+
+const dataType = computed(() => {
+  return props.scope.row['dataType'];
+});
+
+</script>
\ No newline at end of file

@@ -228,14 +228,7 @@ onBeforeUnmount(() => {
 })
 })
 
 
 /** 数仓目录树形列表 */
 /** 数仓目录树形列表 */
-const dataCatalogList = ref([{
-  name: '测试',
-  guid: '1',
-  children: [{
-    name: 'cesi',
-    guid: '1-1'
-  }]
-}]);
+const dataCatalogList = ref([]);
 
 
 const formItems = ref([{
 const formItems = ref([{
   label: "数仓目录",
   label: "数仓目录",
@@ -299,12 +292,37 @@ const dialogBtnClick = (btn, info) => {
   if (btn.value == 'submit') {
   if (btn.value == 'submit') {
     dialogInfo.value.visible = false;
     dialogInfo.value.visible = false;
     if (selectDataCatalogNodeObj.value.parent.data.layereAttribute == 2) { //维度
     if (selectDataCatalogNodeObj.value.parent.data.layereAttribute == 2) { //维度
-window.open(`${import.meta.env.VITE_APP_DATA_DELIVERY}data-catalog/data-warehouse/dim-table-create-manual?domainGuid=${info.domainGuid}&domainName=${selectDataCatalogNodeObj.value.data.name}&metaStandard=${contextNodeData.value.guid}`);
+      router.push({
+        name: 'dimTableCreateManual',
+        query: {
+          domainGuid: info.domainGuid,
+          domainName: selectDataCatalogNodeObj.value.data.name,
+          metaStandard: contextNodeData.value.guid,
+          standardName: contextNodeData.value.label
+        }
+      });
     } else {
     } else {
       if (selectDataCatalogNodeObj.value.parent.data.layereAttribute == 4) {
       if (selectDataCatalogNodeObj.value.parent.data.layereAttribute == 4) {
- window.open(`${import.meta.env.VITE_APP_DATA_DELIVERY}data-catalog/data-warehouse/table-create-manual?domainGuid=${info.domainGuid}&domainName=${selectDataCatalogNodeObj.value.data.name}&layereAttribute=${selectDataCatalogNodeObj.value.parent.data.layereAttribute}&metaStandard=${contextNodeData.value.guid}`);
+        router.push({
+          name: 'tableCreateManual',
+          query: {
+            domainGuid: info.domainGuid,
+            domainName: selectDataCatalogNodeObj.value.data.name,
+            metaStandard: contextNodeData.value.guid,
+            layereAttribute: selectDataCatalogNodeObj.value.parent.data.layereAttribute,
+            standardName: contextNodeData.value.label
+          }
+        });
       } else {
       } else {
-         window.open(`${import.meta.env.VITE_APP_DATA_DELIVERY}data-catalog/data-warehouse/table-create-manual?domainGuid=${info.domainGuid}&domainName=${selectDataCatalogNodeObj.value.data.name}&metaStandard=${contextNodeData.value.guid}`);
+        router.push({
+          name: 'tableCreateManual',
+          query: {
+            domainGuid: info.domainGuid,
+            domainName: selectDataCatalogNodeObj.value.data.name,
+            metaStandard: contextNodeData.value.guid,
+            standardName: contextNodeData.value.label
+          }
+        });
       }
       }
     }
     }
   } else if (btn.value == 'cancel') {
   } else if (btn.value == 'cancel') {