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

package/package.json

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

package/src/index.js

@@ -1,32 +1,32 @@
 /**version-1.0*/
-import Vue from 'vue';
-import Cookies from 'js-cookie';
-import 'normalize.css/normalize.css'; // a modern alternative to CSS resets
-import Element from 'element-ui';
-import '@/styles/element-variables.scss';
-import '@/styles/index.scss'; // global css
+import Vue from "vue";
+import Cookies from "js-cookie";
+import "normalize.css/normalize.css"; // a modern alternative to CSS resets
+import Element from "element-ui";
+import "@/styles/element-variables.scss";
+import "@/styles/index.scss"; // global css
 
-import App from '@base/App';
-import store from '@base/store';
-import router from '@base/router';
+import App from "@base/App";
+import store from "@base/store";
+import router from "@base/router";
 
-import '@/icons'; // icon
-import '@base/permission'; // permission control
+import "@/icons"; // icon
+import "@base/permission"; // permission control
 
-import * as filters from '@base/filters'; // global filters
+import * as filters from "@base/filters"; // global filters
 
 // main.js 文件添加以下代码
 
-import BaseKeepAlive from '@base/utils/keepAlive.js'
+import BaseKeepAlive from "@base/utils/keepAlive.js";
 
-Vue.component('BaseKeepAlive', BaseKeepAlive)
+Vue.component("BaseKeepAlive", BaseKeepAlive);
 
-import VXETable from 'vxe-table';
-import 'vxe-table/lib/style.css';
+import VXETable from "vxe-table";
+import "vxe-table/lib/style.css";
 
 // 引入扩展插件
-import '@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js'
-import '@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css'
+import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js";
+import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css";
 
 /* // 设置授权信息
 VXETable.setup({
@@ -39,9 +39,7 @@ VXETable.setup({
   // }
 }) */
 
-
-
-import Vab from '@base/utils/vab';
+import Vab from "@base/utils/vab";
 
 Vue.use(Vab);
 
@@ -50,54 +48,58 @@ Vue.use(VXETable);
 /* import tablePluns from "@/mixins/table/index.js"
 VXETable.use(tablePluns) */
 
-import '@base/components/table/index.js';
+import "@base/components/table/index.js";
 
-import drag from '@base/directive/el-drag-dialog/index.js';
+import drag from "@base/directive/el-drag-dialog/index.js";
 
 Vue.use(drag.install);
 
-import elDialogCenter from '@base/directive/el-dialog-center/index.js';
+import elDialogCenter from "@base/directive/el-dialog-center/index.js";
 
 Vue.use(elDialogCenter.install);
 
-import ErroreBox from '@base/components/errorMsg/index.js';
+import ErroreBox from "@base/components/errorMsg/index.js";
 
 Vue.use(ErroreBox);
 
-import ExcelExport from '@base/components/excelExport/index.js';
+import ExcelExport from "@base/components/excelExport/index.js";
 
 Vue.use(ExcelExport);
 
-import ExcelImport from '@base/components/excelImport/index.js';
+import ExcelImport from "@base/components/excelImport/index.js";
 
 Vue.use(ExcelImport);
 
-import ConfirmDialog from '@base/components/confirmDialog/index.js';
+import ConfirmDialog from "@base/components/confirmDialog/index.js";
 
 Vue.use(ConfirmDialog);
 
-import baseAlert from '@base/components/baseAlert/index.js';
+import baseAlert from "@base/components/baseAlert/index.js";
 
 Vue.use(baseAlert);
 
-import permission from '@base/directive/permission';
+import permission from "@base/directive/permission";
 
 Vue.use(permission);
 
-import VabUpload from '@base/components/VabUpload/index.js';
+import VabUpload from "@base/components/VabUpload/index.js";
 
 Vue.use(VabUpload);
 
-Vue.component('baseUpload', () => import('@base/components/VabUpload/view.vue'));
+Vue.component("baseUpload", () =>
+  import("@base/components/VabUpload/view.vue")
+);
 
-import baseAttachment from '@base/components/baseAttachment/install';
+import baseAttachment from "@base/components/baseAttachment/install";
 
 Vue.use(baseAttachment);
-Vue.component('attachmentShowList', () => import('@base/components/baseAttachment/showList'));
+Vue.component("attachmentShowList", () =>
+  import("@base/components/baseAttachment/showList")
+);
 
-import '@base/resources/js/base/common.js';
+import "@base/resources/js/base/common.js";
 
-import vxeFilter from '@base/components/table/vxeFilter/index.js';
+import vxeFilter from "@base/components/table/vxeFilter/index.js";
 
 Vue.use(vxeFilter);
 
@@ -105,18 +107,17 @@ import baseTableExport from "@base/components/excelExport/button.vue";
 
 Vue.component(baseTableExport.name, baseTableExport);
 
-
 /* Vue.component('extendedProperties', () => import('@base/components/extendedProperties/view.vue')); */
 
-import LimitNumber from '@base/directive/LimitNumber/index.js';
+import LimitNumber from "@base/directive/LimitNumber/index.js";
 
 Vue.use(LimitNumber);
 
-import baseInputNumber from '@base/components/baseInputNumber/index.vue'
+import baseInputNumber from "@base/components/baseInputNumber/index.vue";
 
 Vue.component(baseInputNumber.name, baseInputNumber);
 
-import elReadonly from '@base/directive/el-readonly/index.js';
+import elReadonly from "@base/directive/el-readonly/index.js";
 
 Vue.use(elReadonly);
 
@@ -125,23 +126,27 @@ Vue.use(elReadonly);
 Vue.use(cnPrint);*/
 
 /* Vue.component('oplogTable', () => import('@base/components/oplogTable/index.vue')); */
-import oplogTable from '@base/components/oplogTable/index.vue'
+import oplogTable from "@base/components/oplogTable/index.vue";
 
 Vue.component(oplogTable.name, oplogTable);
 
-import baseInputBatch from '@base/components/baseInputBatch/index.vue'
+import baseInputBatch from "@base/components/baseInputBatch/index.vue";
 
 Vue.component(baseInputBatch.name, baseInputBatch);
 
-Vue.component('baseInputExport', () => import('@base/components/baseInputExport/index.vue'));
+Vue.component("baseInputExport", () =>
+  import("@base/components/baseInputExport/index.vue")
+);
 
-Vue.component('advancedSearchDialog', () => import('@base/components/advancedSearchDialog/index.vue'));
+Vue.component("advancedSearchDialog", () =>
+  import("@base/components/advancedSearchDialog/index.vue")
+);
 
-import baseTabs from '@base/components/baseTabs/index.vue'
+import baseTabs from "@base/components/baseTabs/index.vue";
 
 Vue.component(baseTabs.name, baseTabs);
 
-import baseTabPane from '@base/components/baseTabs/baseTabPane.vue'
+import baseTabPane from "@base/components/baseTabs/baseTabPane.vue";
 
 Vue.component(baseTabPane.name, baseTabPane);
 
@@ -153,32 +158,38 @@ Vue.component(vb_tabs.name, vb_tabs);
 Vue.component(vb_tab_pane.name, vb_tab_pane);
 Vue.component(xTabs.name, xTabs);
 
-Vue.component('status-tag', () => import('@base/components/statusTag/index.vue'));
+Vue.component("status-tag", () =>
+  import("@base/components/statusTag/index.vue")
+);
 
-Vue.component('CodeEditor', () => import('@base/components/code-editor/index.vue'));
+Vue.component("CodeEditor", () =>
+  import("@base/components/code-editor/index.vue")
+);
 
-Vue.component('scriptDescriptionButton', () => import('@base/components/scriptDescription/button'));
+Vue.component("scriptDescriptionButton", () =>
+  import("@base/components/scriptDescription/button")
+);
 
-Vue.component('scriptTestButton', () => import('@base/components/scriptTest/button'));
+Vue.component("scriptTestButton", () =>
+  import("@base/components/scriptTest/button")
+);
 
-
-import baseTextarea from '@base/components/base-textarea/index.vue'
+import baseTextarea from "@base/components/base-textarea/index.vue";
 
 Vue.component(baseTextarea.name, baseTextarea);
 
-import jsonImport from '@base/components/jsonImport/index.js';
+import jsonImport from "@base/components/jsonImport/index.js";
 
 Vue.use(jsonImport);
 
-import langImport from '@base/components/langImport/index.js';
+import langImport from "@base/components/langImport/index.js";
 
 Vue.use(langImport);
 
 //vform
 // import '@base/components/xform/utils/directive'
 
-
-import i18n from '@base/lang/index.js'
+import i18n from "@base/lang/index.js";
 
 /**
  * If you don't want to use mock-server
@@ -188,28 +199,28 @@ import i18n from '@base/lang/index.js'
  * Currently MockJs will be used in the production environment,
  * please remove it before going online ! ! !
  */
-if (process.env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === "production") {
   /* const { mockXHR } = require('../mock')
   mockXHR() */
 }
 
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
+  size: Cookies.get("size") || "medium", // set element-ui default size
   // locale: enLang // 如果使用中文，无需设置，请删除
 });
 
 // register global utility filters
-Object.keys(filters).forEach(key => {
+Object.keys(filters).forEach((key) => {
   Vue.filter(key, filters[key]);
 });
 
 Vue.config.productionTip = false;
 
 let vue = new Vue({
-  el: '#app',
+  el: "#app",
   router,
   store,
   i18n,
-  render: h => h(App)
+  render: (h) => h(App),
 });
 window.$vueRoot = vue;

package/src/utils/vab.js

@@ -330,6 +330,7 @@ install = (Vue, opts = {}) => {
     "webp",
     "tga",
     "svg",
+    "vue",
   ];
   Vue.prototype.$commonFileUtil = {
     // 文件类型获取与判断接口

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 {