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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.671",
+  "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,6 +33,34 @@ export function getDetailRowKey(row, index = 0) {
   return row.zdEn || row.taZdMc || `idx_${row.orders ?? index}`;
 }
 
+export function sortDetailRowsByZdEn(rows = []) {
+  return [...rows].sort((a, b) => {
+    const aVal = String(a?.zdEn ?? "");
+    const bVal = String(b?.zdEn ?? "");
+    return aVal.localeCompare(bVal, "zh-CN", {
+      numeric: true,
+      sensitivity: "base",
+    });
+  });
+}
+
+export function buildRowDiffMaps(preCellDiff = {}, curCellDiff = {}) {
+  const preRowDiff = {};
+  const curRowDiff = {};
+
+  Object.keys(preCellDiff).forEach((key) => {
+    const rowKey = key.split("__")[0];
+    preRowDiff[rowKey] = true;
+  });
+
+  Object.keys(curCellDiff).forEach((key) => {
+    const rowKey = key.split("__")[0];
+    curRowDiff[rowKey] = true;
+  });
+
+  return { preRowDiff, curRowDiff };
+}
+
 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,
+  buildRowDiffMaps,
+  getDetailRowKey,
+  sortDetailRowsByZdEn,
+} from "./tableDetailDiff";
 
 const zdTypeMap = {
   Boolean: "布尔",
@@ -104,6 +109,10 @@ export default {
         preCellDiff: {},
         curCellDiff: {},
       },
+      detailRowDiff: {
+        pre: {},
+        cur: {},
+      },
     };
   },
   computed: {
@@ -163,8 +172,32 @@ export default {
     formatTreeFlag(cellValue) {
       return this.$t1(treeFlagMap[cellValue] || cellValue || "");
     },
-    getDetailColumns() {
+    getDetailColumns(side) {
+      const rowDiffMap = this.detailRowDiff[side] || {};
       return [
+        {
+          title: "",
+          field: "_diffFlag",
+          width: 32,
+          fixed: "left",
+          align: "center",
+          slots: {
+            default: ({ row, rowIndex }) => {
+              const rowKey = getDetailRowKey(row, rowIndex);
+              if (!rowDiffMap[rowKey]) return [null];
+              return [
+                <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",
@@ -279,26 +312,33 @@ export default {
       };
     },
     initDetailGrids() {
-      this.preRows = this.compareHData1?.szTaZdMbDTOs || [];
-      this.curRows = this.compareHData2?.szTaZdMbDTOs || [];
-      this.detailDiff = buildDetailDiffMaps(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),
       };
@@ -423,6 +463,12 @@ export default {
     color: #67c23a;
   }
 
+  ::v-deep .compare-row-diff-icon {
+    color: #e6a23c;
+    font-size: 14px;
+    cursor: default;
+  }
+
   &.is-section-fullscreen {
     position: fixed;
     top: 0;