Merge branch 'dev_20241202_xukangle' into develop

xukangle
Showing 3 changed files with 78 additions and 72 deletions
src/components/FileUpload/uploadExcelFile.vue
src/views/data_asset/importTableField.vue
src/views/data_asset/registerCatalogManagement.vue
--- a/src/components/FileUpload/uploadExcelFile.vue
View file @f6b63f6
+++ b/src/components/FileUpload/uploadExcelFile.vue
View file @f6b63f6
@@ -8,6 +8,7 @@ import * as XLSX from 'xlsx';
 import {
  getImageContent
 } from '@/api/modules/queryService';
+import { getDownFileSignByUrl, obsDownloadRequest, parseAndDecodeUrl } from "@/api/modules/obsService";
 const props = defineProps({
  noUpload: {
@@ -266,7 +267,7 @@ const formatterPreviewDate = (row, info) => {
  return v;
 };
-const setFormValue = (v) => {
+const setFormValue = async (v) => {
  fileFormItems.value[1].default = v.sheetName || "";
  let url = v.file?.[0]?.url;
  if (fileFormItems.value[0].default?.[0]?.url !== url) {
@@ -275,72 +276,78 @@ const setFormValue = (v) => {
    fileFieldLoading.value = true;
    fileTableFields.value = [];
    fileTableData.value = [];
-    getImageContent(url).then((res: any) => {
+    const refSignInfo: any = await getDownFileSignByUrl(parseAndDecodeUrl(url).fileName);
-      if (res && !res.msg) {
+    if (!refSignInfo?.data) {
-        let urlNames = url.split('/');
+      refSignInfo?.msg && ElMessage.error(refSignInfo?.msg);
-        let name = urlNames.at(-1);
+      return;
-        let reader = new FileReader();
+    }
-        reader.onload = function (e) {
+    const res: any = await obsDownloadRequest(refSignInfo?.data);
-          if (!e?.target) {
+    // getImageContent(url).then((res: any) => {
-            fileFieldLoading.value = false;
+    if (res && !res.msg) {
-            return;
+      let urlNames = url.split('/');
+      let name = urlNames.at(-1);
+      let reader = new FileReader();
+      reader.onload = function (e) {
+        if (!e?.target) {
+          fileFieldLoading.value = false;
+          return;
+        }
+        let data = new Uint8Array(<any>e.target.result);
+        const wb = XLSX.read(data, { type: 'array', raw: false, cellDates: true });
+        fileWb.value = wb;
+        console.log(wb);
+        sheetList.value = wb.SheetNames?.map(s => {
+          return {
+            value: s,
+            label: s
          }
-          let data = new Uint8Array(<any>e.target.result);
+        }) || [];
+        fileFormItems.value[1].options = sheetList.value;
-          const wb = XLSX.read(data, { type: 'array', raw: false, cellDates: true });
+        fileFormItems.value[1].default = v.sheetName || "";
-          fileWb.value = wb;
+        const sheet = wb.Sheets[v.sheetName];
-          console.log(wb);
+        const json: any[] = XLSX.utils.sheet_to_json(sheet, { header: 1 });
-          sheetList.value = wb.SheetNames?.map(s => {
+        if (json.length == 0) {
+          fileTableFields.value = [];
+          fileTableData.value = [];
+        } else {
+          fileTableFields.value = json[0]?.map((j, index) => {
            return {
-              value: s,
+              index: index,
-              label: s
+              enName: j + '',
+              chName: j + '',
+              dataType: 'varchar'
            }
          }) || [];
-          fileFormItems.value[1].options = sheetList.value;
+          if (json.length > 1) {
-          fileFormItems.value[1].default = v.sheetName || "";
+            fileTableData.value = json.slice(1, 51).map((info, row) => {
-          const sheet = wb.Sheets[v.sheetName];
+              let object = {};
-          const json: any[] = XLSX.utils.sheet_to_json(sheet, { header: 1 });
+              json[0].forEach((name, col) => {
-          if (json.length == 0) {
+                if (info[col] === "" || info[col] == null) {
-            fileTableFields.value = [];
+                  object[name] = info[col];
-            fileTableData.value = [];
+                } else {
-          } else {
+                  var cellRef = XLSX.utils.encode_cell({ r: row + 1, c: col });
-            fileTableFields.value = json[0]?.map((j, index) => {
+                  var cell = sheet[cellRef];
-              return {
+                  object[name] = cell.w || info[col];
-                index: index,
+                  let isNum = cell.t == 'n';
-                enName: j + '',
+                  if (isNum && fileTableFields.value[col].dataType != 'int') {
-                chName: j + '',
+                    fileTableFields.value[col].dataType = 'int';
-                dataType: 'varchar'
-              }
-            }) || [];
-            if (json.length > 1) {
-              fileTableData.value = json.slice(1, 51).map((info, row) => {
-                let object = {};
-                json[0].forEach((name, col) => {
-                  if (info[col] === "" || info[col] == null) {
-                    object[name] = info[col];
-                  } else {
-                    var cellRef = XLSX.utils.encode_cell({ r: row + 1, c: col });
-                    var cell = sheet[cellRef];
-                    object[name] = cell.w || info[col];
-                    let isNum = cell.t == 'n';
-                    if (isNum && fileTableFields.value[col].dataType != 'int') {
-                      fileTableFields.value[col].dataType = 'int';
-                    }
                  }
-                });
+                }
-                return object;
              });
-            } else {
+              return object;
-              fileTableData.value = [];
+            });
-            }
+          } else {
+            fileTableData.value = [];
          }
-          fileFieldLoading.value = false;
+        }
-        };
+        fileFieldLoading.value = false;
-        reader.readAsArrayBuffer(res);
+      };
-      } else {
+      reader.readAsArrayBuffer(res);
-        res?.msg && ElMessage.error(res?.msg);
+    } else {
-      }
+      res?.msg && ElMessage.error(res?.msg);
-    })
+    }
+    // })
  }
 }
@@ -371,11 +378,11 @@ defineExpose({
        :style="{ width: '100%', height: '100%' }">
        <template v-for="(item, index) in (fileTableFields || [])">
          <el-table-column :label="item.chName" :width="item.dataType === 'datetime'
-        ? TableColumnWidth.DATETIME
+            ? TableColumnWidth.DATETIME
-        : item.dataType === 'date'
+            : item.dataType === 'date'
-          ? TableColumnWidth.DATE
+              ? TableColumnWidth.DATE
-          : originTableFieldColumn[item.enName]
+              : originTableFieldColumn[item.enName]
-        " :align="getTextAlign(item)" :header-align="getTextAlign(item)"
+            " :align="getTextAlign(item)" :header-align="getTextAlign(item)"
            :formatter="(row) => formatterPreviewDate(row, item)" :show-overflow-tooltip="true">
          </el-table-column>
        </template>
@@ -472,4 +479,4 @@ defineExpose({
    display: none
  }
 }
-</style>
\ No newline at end of file
+</style>
--- a/src/views/data_asset/importTableField.vue
View file @f6b63f6
+++ b/src/views/data_asset/importTableField.vue
View file @f6b63f6
@@ -10,7 +10,6 @@ import {
 import { pinyin } from 'pinyin-pro';
 import useUserStore from "@/store/modules/user";
 import { getDictionaryTree } from '@/api/modules/dataInventory';
-import { pa } from 'element-plus/es/locale';
 const emits = defineEmits([
  "cancelImport",
--- a/src/views/data_asset/registerCatalogManagement.vue
View file @f6b63f6
+++ b/src/views/data_asset/registerCatalogManagement.vue
View file @f6b63f6
@@ -95,7 +95,7 @@ const searchItemList = ref([
  {
    type: "select",
    label: "",
-    field: "registerState",
+    field: "isRegister",
    default: "",
    placeholder: "登记状态",
    clearable: true,
@@ -118,7 +118,7 @@ const pageInfo = ref({
  damType: "",
  tenantGuid: "",
  dataSources: "",
-  registerState: "",
+  isRegister: "",
  subjectDomain: [],
 });
@@ -193,7 +193,7 @@ const getTableData = () => {
    subjectDomain: pageInfo.value.subjectDomain,
    tenantGuid: pageInfo.value.tenantGuid,
    dataSources: pageInfo.value.dataSources,
-    registerState: pageInfo.value.registerState,
+    isRegister: pageInfo.value.isRegister,
  }).then((res: any) => {
    listDataLoading.value = false;
    if (res.code == proxy.$passCode) {
@@ -216,14 +216,14 @@ const toSearch = (val: any, clear: boolean = false) => {
    pageInfo.value.damType = "";
    pageInfo.value.subjectDomain = [];
    pageInfo.value.tenantGuid = "";
-    pageInfo.value.registerState = "";
+    pageInfo.value.isRegister = "";
    pageInfo.value.dataSources = "";
  } else {
    pageInfo.value.damName = val.damName;
    pageInfo.value.damType = val.damType;
    pageInfo.value.subjectDomain = val.subjectDomain;
    pageInfo.value.tenantGuid = val.tenantGuid;
-    pageInfo.value.registerState = val.registerState;
+    pageInfo.value.isRegister = val.isRegister;
    pageInfo.value.dataSources = val.dataSources;
  }
  getTableData();