Merge commit '9c0e648f' into release-test

@@ -5,7 +5,7 @@ export const useValidator = () => {
   const required = (message?: string): FormItemRule => {
   const required = (message?: string): FormItemRule => {
     return {
     return {
       required: true,
       required: true,
-      message: message || '该项为必填项'
+      message: message || '该项为必填项',
     }
     }
   }
   }
 
 
@@ -64,7 +64,7 @@ export const useValidator = () => {
     }
     }
   }
   }
 
 
-  /** 
+  /**
    * 调用接口检查名称是否重复
    * 调用接口检查名称是否重复
    * @param checkedInfo 已检查过的名称，防止重复调用接口，
    * @param checkedInfo 已检查过的名称，防止重复调用接口，
    * @param editCurrInfo 若是编辑状态时，传递当前编辑信息，若是与编辑相等的内容，则不调用接口检查。
    * @param editCurrInfo 若是编辑状态时，传递当前编辑信息，若是与编辑相等的内容，则不调用接口检查。

@@ -106,7 +106,7 @@ const systemRoutes: RouteRecordRaw[] = [
 const asyncRoutes: Route.recordMainRaw[] = [
 const asyncRoutes: Route.recordMainRaw[] = [
   {
   {
     meta:{
     meta:{
-      title: '首页',
+      title: '数据资产看板',
     },
     },
     children: [
     children: [
       ...AssetIndex,
       ...AssetIndex,

@@ -237,13 +237,11 @@ const useUserStore = defineStore(
           mark = 'data-quality'
           mark = 'data-quality'
         } else if (item.meta.title == '数据盘点') {
         } else if (item.meta.title == '数据盘点') {
           mark = 'data-inventory'
           mark = 'data-inventory'
-        } else if (item.meta.title == '首页') {
+        } else if (item.meta.title == '数据资产看板') {
           mark = 'data-asset-index'
           mark = 'data-asset-index'
         } else if (item.meta.title == '数据资产登记') {
         } else if (item.meta.title == '数据资产登记') {
           mark = 'data-asset-register'
           mark = 'data-asset-register'
-        } else if (item.meta.title == '首页') {
-          mark = 'data-asset-index'
-        } else if (item.meta.title == '数据产品管理') {
+        }  else if (item.meta.title == '数据产品管理') {
           mark = 'data-asset'
           mark = 'data-asset'
         } else if (item.meta.title == '入表交易融资') {
         } else if (item.meta.title == '入表交易融资') {
           mark = 'data-transaction'
           mark = 'data-transaction'

@@ -298,6 +298,8 @@ const baseInfoFormRules = ref({
   sceneDescription: [required('请填写应用场景描述')],
   sceneDescription: [required('请填写应用场景描述')],
   sceneLimit: [required('请填写应用场景限制')],
   sceneLimit: [required('请填写应用场景限制')],
   rightMain: [required('请填写权利主体')],
   rightMain: [required('请填写权利主体')],
+  dataSources: [required('请选择数据来源')],
+  isPublicData: [required('请选择是否公共数据')],
 });
 });
 
 
 const getTableFieldPromise: any = ref({});
 const getTableFieldPromise: any = ref({});
@@ -520,12 +522,13 @@ onBeforeMount(() => {
   })
   })
   if (damGuid.value) {
   if (damGuid.value) {
     fullscreenLoading.value = true;
     fullscreenLoading.value = true;
+
     getRegisterCatalogDetail(damGuid.value).then((res: any) => {
     getRegisterCatalogDetail(damGuid.value).then((res: any) => {
       fullscreenLoading.value = false;
       fullscreenLoading.value = false;
       if (res.code == proxy.$passCode) {
       if (res.code == proxy.$passCode) {
         detailInfo.value = res.data || {};
         detailInfo.value = res.data || {};
         baseInfoFormItems.value.forEach((item: any) => {
         baseInfoFormItems.value.forEach((item: any) => {
-          item.default = detailInfo.value[item.field] || '';
+          item.default = detailInfo.value[item.field] == null ? '' : detailInfo.value[item.field];
           if (item.field == 'subjectDomain') {
           if (item.field == 'subjectDomain') {
             let tree = detailInfo.value.subjectDomainTree?.[0];
             let tree = detailInfo.value.subjectDomainTree?.[0];
             if (tree) {
             if (tree) {
@@ -582,9 +585,13 @@ onBeforeMount(() => {
           }
           }
         }
         }
         checkedInfo.value = {};
         checkedInfo.value = {};
+        console.log(baseInfoFormRef.value, 'baseInfoFormRules');
         nextTick(() => {
         nextTick(() => {
           baseInfoFormRules.value.damName[1] = checkExistName(checkedInfo.value, existDamName, detailInfo.value, 'damName');
           baseInfoFormRules.value.damName[1] = checkExistName(checkedInfo.value, existDamName, detailInfo.value, 'damName');
         })
         })
+        setTimeout(() => {
+          baseInfoFormRef.value.ruleFormRef.clearValidate(['sceneDescription', 'subjectDomain', 'coverageAreas', 'isPublicData', 'dataSources', 'propertyDescription', 'sceneLimit']);
+        }, 0);
         assetDataTableInfo.value.data = detailInfo.value.damCatalogTableInfo;
         assetDataTableInfo.value.data = detailInfo.value.damCatalogTableInfo;
       } else {
       } else {
         proxy.$ElMessage.error(res.msg);
         proxy.$ElMessage.error(res.msg);

@@ -550,8 +550,8 @@ const formItems = ref<any>([
     templateUrl: 'auto',
     templateUrl: 'auto',
     templateClick: () => {
     templateClick: () => {
       const link = document.createElement('a');
       const link = document.createElement('a');
-      link.href = "/files/数据质量评价.docx";
-      link.download = '数据质量评价.docx';
+      link.href = "/files/数据价值评估.docx";
+      link.download = '数据价值评估.docx';
       document.body.appendChild(link);
       document.body.appendChild(link);
       link.click();
       link.click();
       link.remove();
       link.remove();