cloud-web-corejs 1.0.54-dev.641 → 1.0.54-dev.643

package/package.json

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

package/src/components/hiprint/hiprint.bundle.js

@@ -36,7 +36,7 @@ function _typeof(obj) {
  * import 相关资源
  */
 import jquery from "jquery";
-// js颜色选择
+// js颜色选择（webpack 下会注册在 npm jquery 实例上，需与全局 jQuery 同步）
 import "@claviska/jquery-minicolors/jquery.minicolors.min";
 // 条形码
 import JsBarcode from "jsbarcode";
@@ -60,11 +60,18 @@ import Canvg from 'canvg';
 import defaultTypeProvider from "./etypes/default-etyps-provider";
 
 // window.$ = window.jQuery = $;
-if(window.$){
+if (window.$) {
   window.jQuery = window.$;
-}else{
+} else {
   window.$ = window.jQuery = jquery;
 }
+// minicolors 通过 require('jquery') 挂载，与页面 script 引入的全局 jQuery 可能不是同一实例
+if (window.jQuery !== jquery && jquery.fn.minicolors && !window.jQuery.fn.minicolors) {
+  window.jQuery.fn.minicolors = jquery.fn.minicolors;
+}
+if (window.jQuery !== jquery && jquery.minicolors && !window.jQuery.minicolors) {
+  window.jQuery.minicolors = jquery.minicolors;
+}
 window.autoConnect = false;
 window.io = io;
 

package/src/views/bd/setting/table_model/edit.vue

@@ -465,14 +465,18 @@
                         v-el-readonly
                         v-if="isReferenceZdType(row.zdType)"
                         :disabled="!row.zdEn"
-                        clearable
-                        @clear="clearReferenceZd(row)"
                       >
-                        <i
-                          slot="suffix"
-                          class="el-input__icon el-icon-search"
-                          @click="openReferenceZdDialog(row, rowIndex, $table)"
-                        ></i>
+                        <span slot="suffix" class="el-input__suffix-inner">
+                          <i
+                            v-if="row.referenceZd"
+                            class="el-input__icon el-icon-circle-close"
+                            @click.stop="confirmClearReferenceZd(row)"
+                          ></i>
+                          <i
+                            class="el-input__icon el-icon-search"
+                            @click="openReferenceZdDialog(row, rowIndex, $table)"
+                          ></i>
+                        </span>
                       </el-input>
                       <template v-else>
                         {{ row.referenceZd }}

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -121,7 +121,7 @@ modules = {
         Text: "文本",
         TextArea: "长文本",
         DateTime: "日期时间",
-        Reference: "关联表",
+        Reference: "关联表(文本)",
         ReferenceLong: "关联表(长整型)",
       },
 
@@ -736,6 +736,41 @@ modules = {
         this.clearReferenceZd(row);
       }
     },
+    getReferenceChildRows(row) {
+      let referenceZd = row.referenceZd;
+      if (!referenceZd && !row.zdEn) {
+        return [];
+      }
+      let referenceZd2 = referenceZd ? referenceZd + "." + row.zdEn : null;
+      let relationZdSuffix = row.zdEn ? "." + row.zdEn : null;
+      return this.szTaMb.szTaZdMbDTOs.filter((item) => {
+        if (referenceZd && (referenceZd === item.relationZd || referenceZd2 === item.relationZd)) {
+          return true;
+        }
+        if (relationZdSuffix && item.relationZd && item.relationZd.endsWith(relationZdSuffix)) {
+          return true;
+        }
+        return false;
+      });
+    },
+    confirmClearReferenceZd(row) {
+      if (!row.referenceZd) {
+        return;
+      }
+      if (this.hasFieldCreated(row)) {
+        this.$baseAlert(this.$t1("该字段已在数据库中创建，不能清空关联配置"));
+        return;
+      }
+      let childRows = this.getReferenceChildRows(row);
+      if (childRows.some((item) => this.hasFieldCreated(item))) {
+        this.$baseAlert(this.$t1("关联显示字段已在数据库中创建，不能清空关联配置"));
+        return;
+      }
+      let text = this.$t1("清空关联配置将同时删除关联显示字段，您确定要继续吗？");
+      this.$baseConfirm(text).then(() => {
+        this.clearReferenceZd(row);
+      });
+    },
     clearReferenceZd(row) {
       let referenceZd = row.referenceZd;
       if (referenceZd) {

package/src/views/bd/setting/table_model/mixins/zdDialog.js

@@ -1,9 +1,9 @@
-import {selectDialogMixins} from "@base/mixins/selectDialog";
+import { selectDialogMixins } from "@base/mixins/selectDialog";
 
 let modules = {};
 modules = {
-  name: 'zdDialog',
-  props: ['visiable', 'multi', 'rows', 'param', 'taBm'],
+  name: "zdDialog",
+  props: ["visiable", "multi", "rows", "param", "taBm"],
   mixins: [selectDialogMixins],
   components: {},
   created() {
@@ -20,7 +20,7 @@ modules = {
       formData: {},
       vxeOption: {},
       showSaleOrgDialog: false,
-      fieldKey: "taZdMc"
+      fieldKey: "taZdMc",
     };
   },
   methods: {
@@ -28,86 +28,89 @@ modules = {
       let that = this;
 
       let zdTypeMap = {
-        Boolean: this.$t1('布尔'),
-        Integer: this.$t1('整数'),
-        Long: this.$t1('长整数'),
-        Decimal: this.$t1('精度小数'),
-        Money: this.$t1('金额'),
-        Text: this.$t1('文本'),
-        TextArea: this.$t1('长文本'),
-        DateTime: this.$t1('日期时间'),
-        Reference: this.$t1('关联表'),
-        ReferenceLong: this.$t1('关联表(长整型)')
-      }
+        Boolean: this.$t1("布尔"),
+        Integer: this.$t1("整数"),
+        Long: this.$t1("长整数"),
+        Decimal: this.$t1("精度小数"),
+        Money: this.$t1("金额"),
+        Text: this.$t1("文本"),
+        TextArea: this.$t1("长文本"),
+        DateTime: this.$t1("日期时间"),
+        Reference: this.$t1("关联表(文本)"),
+        ReferenceLong: this.$t1("关联表(长整型)"),
+      };
 
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'bd_table_model_field_dialog-m1',
-        path: USER_PREFIX + '/szTaMb/getSzTaZdMbsByTaBm',
+        tableRef: "table-m1",
+        tableName: "bd_table_model_field_dialog-m1",
+        path: USER_PREFIX + "/szTaMb/getSzTaZdMbsByTaBm",
         param: () => {
           return {
             taBm: this.taBm,
             enabled: true,
             searchDb: true,
             ...this.formData,
-            ...this.param
+            ...this.param,
           };
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
-            title: this.$t1('实体字段名称'),
-            field: 'zdEn',
-            width: 150
+            title: this.$t1("实体字段名称"),
+            field: "zdEn",
+            width: 150,
           },
           {
-            title: this.$t1('数据库表字段名'),
-            field: 'taZdMc',
-            width: 150
+            title: this.$t1("数据库表字段名"),
+            field: "taZdMc",
+            width: 150,
           },
           {
-            title: this.$t1('字段描述'),
-            field: 'zdCh',
-            width: 150
+            title: this.$t1("字段描述"),
+            field: "zdCh",
+            width: 150,
           },
           {
-            title: this.$t1('字段类型'), field: 'zdType', width: 150, slots: {
-              default: ({row, rowIndex, $table}) => {
+            title: this.$t1("字段类型"),
+            field: "zdType",
+            width: 150,
+            slots: {
+              default: ({ row, rowIndex, $table }) => {
                 return zdTypeMap[row.zdType];
-              }
-            }
+              },
+            },
           },
           {
-            title: this.$t1('关联字段'),
-            field: 'referenceZd',
-            width: 150
+            title: this.$t1("关联字段"),
+            field: "referenceZd",
+            width: 150,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
+            trigger: "row",
           },
           proxyConfig: {
             props: {
               result: "objx", // 配置响应结果列表字段
               total: "objx.length", // 配置响应结果总页数字段
-            }
-          }
-        }
+            },
+          },
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
     },
-  }
+  },
 };
-export default modules
+export default modules;