cloud-web-corejs 1.0.54-dev.672 → 1.0.54-dev.673

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.672",
+  "version": "1.0.54-dev.673",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/bd/setting/formVersion/tableDetailDiff.js

@@ -33,46 +33,32 @@ export function getDetailRowKey(row, index = 0) {
   return row.zdEn || row.taZdMc || `idx_${row.orders ?? index}`;
 }
 
-export function sortDetailRows(rows = []) {
+export function sortDetailRowsByZdEn(rows = []) {
   return [...rows].sort((a, b) => {
-    const nameA = (a?.zdEn ?? "").toString();
-    const nameB = (b?.zdEn ?? "").toString();
-    return nameA.localeCompare(nameB, "zh-CN");
+    const aVal = String(a?.zdEn ?? "");
+    const bVal = String(b?.zdEn ?? "");
+    return aVal.localeCompare(bVal, "zh-CN", {
+      numeric: true,
+      sensitivity: "base",
+    });
   });
 }
 
-export function buildDetailRowDiffSet(preRows = [], curRows = []) {
-  const preMap = new Map();
-  const curMap = new Map();
+export function buildRowDiffMaps(preCellDiff = {}, curCellDiff = {}) {
+  const preRowDiff = {};
+  const curRowDiff = {};
 
-  preRows.forEach((row, index) => {
-    preMap.set(getDetailRowKey(row, index), row);
+  Object.keys(preCellDiff).forEach((key) => {
+    const rowKey = key.split("__")[0];
+    preRowDiff[rowKey] = true;
   });
-  curRows.forEach((row, index) => {
-    curMap.set(getDetailRowKey(row, index), row);
-  });
-
-  const rowDiffSet = new Set();
-  const allKeys = new Set([...preMap.keys(), ...curMap.keys()]);
-
-  allKeys.forEach((key) => {
-    const preRow = preMap.get(key);
-    const curRow = curMap.get(key);
 
-    if (!preRow || !curRow) {
-      rowDiffSet.add(key);
-      return;
-    }
-
-    const hasDiff = DETAIL_COMPARE_FIELDS.some(
-      (field) => !isSameValue(preRow[field], curRow[field])
-    );
-    if (hasDiff) {
-      rowDiffSet.add(key);
-    }
+  Object.keys(curCellDiff).forEach((key) => {
+    const rowKey = key.split("__")[0];
+    curRowDiff[rowKey] = true;
   });
 
-  return rowDiffSet;
+  return { preRowDiff, curRowDiff };
 }
 
 export function buildDetailDiffMaps(preRows = [], curRows = []) {

package/src/views/bd/setting/formVersion/tableModelCompareView.vue

@@ -64,9 +64,9 @@ import compareMixin from "./compareMixin";
 import compareBasicSection from "./compareBasicSection.vue";
 import {
   buildDetailDiffMaps,
-  buildDetailRowDiffSet,
+  buildRowDiffMaps,
   getDetailRowKey,
-  sortDetailRows,
+  sortDetailRowsByZdEn,
 } from "./tableDetailDiff";
 
 const zdTypeMap = {
@@ -109,7 +109,10 @@ export default {
         preCellDiff: {},
         curCellDiff: {},
       },
-      detailRowDiffSet: new Set(),
+      detailRowDiff: {
+        pre: {},
+        cur: {},
+      },
     };
   },
   computed: {
@@ -169,33 +172,38 @@ export default {
     formatTreeFlag(cellValue) {
       return this.$t1(treeFlagMap[cellValue] || cellValue || "");
     },
-    getDetailColumns() {
+    getDetailColumns(side) {
+      const rowDiffMap = this.detailRowDiff[side] || {};
       return [
         {
-          title: this.$t1("实体字段名称"),
-          field: "zdEn",
-          width: 150,
+          title: "",
+          field: "_diffFlag",
+          width: 32,
           fixed: "left",
+          align: "center",
           slots: {
             default: ({ row, rowIndex }) => {
-              const hasDiff = this.hasDetailRowDiff(row, rowIndex);
+              const rowKey = getDetailRowKey(row, rowIndex);
+              if (!rowDiffMap[rowKey]) return [null];
               return [
-                <span class="detail-zd-en-cell">
-                  {hasDiff ? (
-                    <el-tooltip
-                      effect="dark"
-                      content={this.$t1("存在不同项")}
-                      placement="top"
-                    >
-                      <i class="el-icon-warning compare-row-diff-icon" />
-                    </el-tooltip>
-                  ) : null}
-                  <span>{row.zdEn}</span>
-                </span>,
+                <el-tooltip
+                  enterable={false}
+                  effect="dark"
+                  content={this.$t1("存在差异项")}
+                  placement="top"
+                >
+                  <i class="el-icon-warning compare-row-diff-icon" />
+                </el-tooltip>,
               ];
             },
           },
         },
+        {
+          title: this.$t1("实体字段名称"),
+          field: "zdEn",
+          width: 150,
+          fixed: "left",
+        },
         {
           title: this.$t1("数据库表字段名"),
           field: "taZdMc",
@@ -304,27 +312,33 @@ export default {
       };
     },
     initDetailGrids() {
-      this.preRows = sortDetailRows(this.compareHData1?.szTaZdMbDTOs || []);
-      this.curRows = sortDetailRows(this.compareHData2?.szTaZdMbDTOs || []);
-      this.detailDiff = buildDetailDiffMaps(this.preRows, this.curRows);
-      this.detailRowDiffSet = buildDetailRowDiffSet(this.preRows, this.curRows);
+      const rawPreRows = this.compareHData1?.szTaZdMbDTOs || [];
+      const rawCurRows = this.compareHData2?.szTaZdMbDTOs || [];
+      this.detailDiff = buildDetailDiffMaps(rawPreRows, rawCurRows);
+      const { preRowDiff, curRowDiff } = buildRowDiffMaps(
+        this.detailDiff.preCellDiff,
+        this.detailDiff.curCellDiff
+      );
+      this.detailRowDiff = { pre: preRowDiff, cur: curRowDiff };
+      this.preRows = sortDetailRowsByZdEn(rawPreRows);
+      this.curRows = sortDetailRowsByZdEn(rawCurRows);
 
-      const columns = this.getDetailColumns();
       const baseConfig = {
         border: true,
         resizable: true,
         showOverflow: true,
         scrollX: { enabled: true },
-        columns,
         ...this.getGridSizeConfig(),
       };
       this.preGridOption = {
         ...baseConfig,
+        columns: this.getDetailColumns("pre"),
         data: this.preRows,
         cellClassName: (params) => this.getPreCellClassName(params),
       };
       this.curGridOption = {
         ...baseConfig,
+        columns: this.getDetailColumns("cur"),
         data: this.curRows,
         cellClassName: (params) => this.getCurCellClassName(params),
       };
@@ -358,9 +372,6 @@ export default {
     getCurCellClassName({ row, column, rowIndex }) {
       return this.getDetailCellClassName("cur", row, column, rowIndex);
     },
-    hasDetailRowDiff(row, rowIndex) {
-      return this.detailRowDiffSet.has(getDetailRowKey(row, rowIndex));
-    },
     getDetailCellClassName(side, row, column, rowIndex) {
       const field = column.field;
       if (!field || !row) return "";
@@ -452,18 +463,10 @@ export default {
     color: #67c23a;
   }
 
-  ::v-deep .detail-zd-en-cell {
-    display: inline-flex;
-    align-items: center;
-    max-width: 100%;
-
-    .compare-row-diff-icon {
-      flex-shrink: 0;
-      margin-right: 4px;
-      font-size: 14px;
-      color: #e6a23c;
-      cursor: default;
-    }
+  ::v-deep .compare-row-diff-icon {
+    color: #e6a23c;
+    font-size: 14px;
+    cursor: default;
   }
 
   &.is-section-fullscreen {