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

package/package.json

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

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

@@ -33,6 +33,48 @@ export function getDetailRowKey(row, index = 0) {
   return row.zdEn || row.taZdMc || `idx_${row.orders ?? index}`;
 }
 
+export function sortDetailRows(rows = []) {
+  return [...rows].sort((a, b) => {
+    const nameA = (a?.zdEn ?? "").toString();
+    const nameB = (b?.zdEn ?? "").toString();
+    return nameA.localeCompare(nameB, "zh-CN");
+  });
+}
+
+export function buildDetailRowDiffSet(preRows = [], curRows = []) {
+  const preMap = new Map();
+  const curMap = new Map();
+
+  preRows.forEach((row, index) => {
+    preMap.set(getDetailRowKey(row, index), row);
+  });
+  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);
+    }
+  });
+
+  return rowDiffSet;
+}
+
 export function buildDetailDiffMaps(preRows = [], curRows = []) {
   const preMap = new Map();
   const curMap = new Map();

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

@@ -62,7 +62,12 @@
 <script>
 import compareMixin from "./compareMixin";
 import compareBasicSection from "./compareBasicSection.vue";
-import { buildDetailDiffMaps, getDetailRowKey } from "./tableDetailDiff";
+import {
+  buildDetailDiffMaps,
+  buildDetailRowDiffSet,
+  getDetailRowKey,
+  sortDetailRows,
+} from "./tableDetailDiff";
 
 const zdTypeMap = {
   Boolean: "布尔",
@@ -104,6 +109,7 @@ export default {
         preCellDiff: {},
         curCellDiff: {},
       },
+      detailRowDiffSet: new Set(),
     };
   },
   computed: {
@@ -170,6 +176,25 @@ export default {
           field: "zdEn",
           width: 150,
           fixed: "left",
+          slots: {
+            default: ({ row, rowIndex }) => {
+              const hasDiff = this.hasDetailRowDiff(row, rowIndex);
+              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>,
+              ];
+            },
+          },
         },
         {
           title: this.$t1("数据库表字段名"),
@@ -279,9 +304,10 @@ export default {
       };
     },
     initDetailGrids() {
-      this.preRows = this.compareHData1?.szTaZdMbDTOs || [];
-      this.curRows = this.compareHData2?.szTaZdMbDTOs || [];
+      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 columns = this.getDetailColumns();
       const baseConfig = {
@@ -332,6 +358,9 @@ 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 "";
@@ -423,6 +452,20 @@ 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;
+    }
+  }
+
   &.is-section-fullscreen {
     position: fixed;
     top: 0;