mooho-base-admin-plus 0.4.83 → 0.4.84

package/index.html

@@ -11,44 +11,6 @@
     <noscript>
       <strong>请开启 JavaScript 功能。</strong>
     </noscript>
-    <!-- <div id="preloader" class="page-loader-wrapper">
-      <div class="loader">
-        <img class="zmdi-hc-spin" src="static/images/logo.svg" width="64" height="64" />
-      </div>
-      <style>
-        /* 遮罩层 */
-        .page-loader-wrapper {
-          z-index: 99999999;
-          position: fixed;
-          top: 0;
-          left: 0;
-          bottom: 0;
-          right: 0;
-          width: 100%;
-          height: 100%;
-          overflow: hidden;
-          text-align: center;
-          opacity: 0.5;
-          background: #000;
-          /* display: none; */
-        }
-
-        .page-loader-wrapper .loader {
-          position: relative;
-          top: 40%;
-        }
-
-        .zmdi-hc-spin {
-          -webkit-animation: zmdi-spin 1.5s infinite linear;
-          animation: zmdi-spin 1.5s infinite linear;
-        }
-
-        .zmdi-hc-spin-reverse {
-          -webkit-animation: zmdi-spin-reverse 1.5s infinite linear;
-          animation: zmdi-spin-reverse 1.5s infinite linear;
-        }
-      </style>
-    </div> -->
     <div id="app"></div>
     <script type="module" src="/test/main.js"></script>
   </body>

package/package/mooho-base-admin-plus.min.esm.js

@@ -22828,7 +22828,7 @@ const _hoisted_7$b = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createEl
 const _hoisted_8$a = { class: "stat" };
 const _hoisted_9$8 = { class: "icon" };
 const _hoisted_10$4 = { class: "content" };
-const _hoisted_11$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "value1" }, "\u5F85\u5206\u6D3E", -1));
+const _hoisted_11$3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "value1" }, "\u5F85\u5206\u6D3E", -1));
 const _hoisted_12$3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "value2" }, "\u5DF2\u5206\u6D3E", -1));
 const _hoisted_13$3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("p", null, [
   /* @__PURE__ */ createElementVNode("span", null, "\u68C0\u6D4B\u62A5\u544A")
@@ -22943,7 +22943,7 @@ function _sfc_render$1n(_ctx, _cache, $props, $setup, $data, $options) {
                                 }, null, 512), [
                                   [_directive_font, 30]
                                 ]),
-                                _hoisted_11$4
+                                _hoisted_11$3
                               ]),
                               createElementVNode("div", null, [
                                 withDirectives(createVNode$1(_component_Numeral, {
@@ -26980,7 +26980,7 @@ const _hoisted_7$a = /* @__PURE__ */ createElementVNode("marker", {
 const _hoisted_8$9 = ["id", "d"];
 const _hoisted_9$7 = ["width"];
 const _hoisted_10$3 = ["x", "y", "width", "height"];
-const _hoisted_11$3 = ["x", "y", "font-size"];
+const _hoisted_11$2 = ["x", "y", "font-size"];
 const _hoisted_12$2 = ["x", "y", "width", "height", "onMousedown", "onMouseup", "onDblclick"];
 const _hoisted_13$2 = ["x", "y", "width", "height"];
 const _hoisted_14$1 = ["x", "y", "font-size"];
@@ -27127,7 +27127,7 @@ function _sfc_render$$(_ctx, _cache, $props, $setup, $data, $options) {
                     "font-size": $data.setting.rectFontSize,
                     "text-anchor": "middle",
                     "dominant-baseline": "middle"
-                  }, toDisplayString$1(item.name), 9, _hoisted_11$3),
+                  }, toDisplayString$1(item.name), 9, _hoisted_11$2),
                   createElementVNode("rect", {
                     opacity: "0",
                     rx: "25",
@@ -35524,14 +35524,14 @@ const _sfc_main$w = {
             pattern: /.+/,
             required: true,
             message: this.$t("Front_Msg_Please_Input"),
-            trigger: this.getTrigger(column)
+            trigger: "blur,change"
           });
         } else {
           rules.push({
             type: this.getDataType(column),
             required: true,
             message: this.$t("Front_Msg_Please_Input"),
-            trigger: this.getTrigger(column)
+            trigger: "blur,change"
           });
         }
       }
@@ -35540,7 +35540,7 @@ const _sfc_main$w = {
           type: this.getDataType(column),
           pattern: column.pattern,
           message: this.$t("Front_Msg_Validation_Pattern"),
-          trigger: this.getTrigger(column)
+          trigger: "blur,change"
         });
       }
       if (column.maxValue != null) {
@@ -35548,7 +35548,7 @@ const _sfc_main$w = {
           type: this.getDataType(column),
           max: column.maxValue,
           message: this.$t("Front_Msg_Validation_Max_Value|" + column.maxValue),
-          trigger: this.getTrigger(column)
+          trigger: "blur,change"
         });
       }
       if (column.minValue != null) {
@@ -35556,7 +35556,7 @@ const _sfc_main$w = {
           type: this.getDataType(column),
           min: column.minValue,
           message: this.$t("Front_Msg_Validation_Min_Value|" + column.minValue),
-          trigger: this.getTrigger(column)
+          trigger: "blur,change"
         });
       }
       if (column.maxLength != null) {
@@ -35564,7 +35564,7 @@ const _sfc_main$w = {
           type: this.getDataType(column),
           length: column.maxLength,
           message: this.$t("Front_Msg_Validation_Max_Length|" + column.maxLength),
-          trigger: this.getTrigger(column)
+          trigger: "blur,change"
         });
       }
       return rules;
@@ -35886,13 +35886,6 @@ const _sfc_main$w = {
           return "integer";
       }
     },
-    getTrigger(column) {
-      if (column.controlType === "TextInput" || column.controlType === "NumberInput") {
-        return "blur,change";
-      } else {
-        return "blur,change";
-      }
-    },
     parseDataWithOther(model2, column) {
       let expression2 = column.code;
       let selectValue = this.parseData(model2, expression2 + "_o");
@@ -41678,7 +41671,7 @@ const _hoisted_7$3 = ["href"];
 const _hoisted_8$3 = { style: { "margin": "auto 4px" } };
 const _hoisted_9$2 = ["onClick", "src"];
 const _hoisted_10$2 = { class: "ivu-mt ivu-text-right" };
-const _hoisted_11$2 = { style: { "text-align": "center" } };
+const _hoisted_11$1 = { style: { "text-align": "center" } };
 const _hoisted_12$1 = ["download"];
 const _hoisted_13$1 = ["src"];
 function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
@@ -42473,7 +42466,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
           })
         ]),
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_11$2, [
+          createElementVNode("div", _hoisted_11$1, [
             createElementVNode("a", {
               href: "#",
               download: $data.imageUrl,
@@ -49139,7 +49132,9 @@ const _sfc_main$o = {
       tabName: "",
       rules: {},
       data: null,
-      compareData: null
+      compareData: null,
+      dragging: false,
+      draggingColumn: null
     };
   },
   async created() {
@@ -49166,6 +49161,86 @@ const _sfc_main$o = {
           return 100 * 4 / 24;
       }
     },
+    getRules(column) {
+      if (!column.isShow) {
+        return [];
+      }
+      let rules = [];
+      if (column.isRequired) {
+        if (column.controlType == "Date" || column.controlType == "DateTime" || column.controlType == "Year" || column.controlType == "Month" || column.controlType == "DateRange") {
+          rules.push({
+            pattern: /.+/,
+            required: true,
+            message: this.$t("Front_Msg_Please_Input"),
+            trigger: "blur,change"
+          });
+        } else {
+          rules.push({
+            type: this.getDataType(column),
+            required: true,
+            message: this.$t("Front_Msg_Please_Input"),
+            trigger: "blur,change"
+          });
+        }
+      }
+      if (column.pattern && column.controlType == "TextInput") {
+        rules.push({
+          type: this.getDataType(column),
+          pattern: column.pattern,
+          message: this.$t("Front_Msg_Validation_Pattern"),
+          trigger: "blur,change"
+        });
+      }
+      if (column.maxValue != null) {
+        rules.push({
+          type: this.getDataType(column),
+          max: column.maxValue,
+          message: this.$t("Front_Msg_Validation_Max_Value|" + column.maxValue),
+          trigger: "blur,change"
+        });
+      }
+      if (column.minValue != null) {
+        rules.push({
+          type: this.getDataType(column),
+          min: column.minValue,
+          message: this.$t("Front_Msg_Validation_Min_Value|" + column.minValue),
+          trigger: "blur,change"
+        });
+      }
+      if (column.maxLength != null) {
+        rules.push({
+          type: this.getDataType(column),
+          length: column.maxLength,
+          message: this.$t("Front_Msg_Validation_Max_Length|" + column.maxLength),
+          trigger: "blur,change"
+        });
+      }
+      return rules;
+    },
+    getDataType(column) {
+      if (!(column.dataType || "").trim()) {
+        return null;
+      }
+      if (column.dataType.indexOf("Enum:") === 0) {
+        return "string";
+      }
+      switch (column.dataType) {
+        case "String":
+        case "BigInteger":
+          return "string";
+        case "Boolean":
+          return "boolean";
+        case "DateTime":
+          return "date";
+        case "Float":
+        case "Double":
+        case "Decimal":
+          return "number";
+        case "Short":
+        case "Integer":
+          return "integer";
+      }
+    },
     tabColumns(index2) {
       return this.columns.filter((item) => {
         return item.tabIndex === index2 || item.tabIndex == null;
@@ -49301,7 +49376,7 @@ const _sfc_main$o = {
       return result2;
     },
     getDataSource(data2, column) {
-      if (!column.isStaticItem && column.dataType.indexOf("Enum:") === 0) {
+      if (!column.isStaticItem && column.dataType && column.dataType.indexOf("Enum:") === 0) {
         return this.getEnumList(column.dataType.split(":")[1]);
       } else {
         return column.dataSource == null ? [] : column.dataSource;
@@ -49406,12 +49481,6 @@ const _sfc_main$o = {
       }
       return data2;
     },
-    mouseover(column) {
-      column.showButton = true;
-    },
-    mouseleave(column) {
-      column.showButton = false;
-    },
     edit(column, index2) {
       this.$emit("edit", { column, index: index2 });
     },
@@ -49450,20 +49519,95 @@ const _sfc_main$o = {
       } else {
         return value;
       }
+    },
+    getNameI18n(column) {
+      if (this.layout.showI18n) {
+        if (column.code) {
+          let key = "DataView_" + this.formView.code + "_" + column.code;
+          let text2 = this.$t(key);
+          if (text2 == key) {
+            return column.name;
+          } else {
+            return text2;
+          }
+        } else {
+          return column.name;
+        }
+      } else {
+        return column.name;
+      }
+    },
+    getRightWidth(index2) {
+      let current = 0;
+      for (let i3 = 0; i3 <= index2; i3++) {
+        let width = 0;
+        switch (this.columns[i3].columnWidth) {
+          case "Column12":
+            width = 24;
+            break;
+          case "Column9":
+            width = 18;
+            break;
+          case "Column8":
+            width = 16;
+            break;
+          case "Column6":
+            width = 12;
+            break;
+          case "Column4":
+            width = 8;
+            break;
+          case "Column3":
+            width = 6;
+            break;
+          case "Column2":
+            width = 4;
+            break;
+        }
+        if (width == 24) {
+          current = 0;
+        } else if (this.columns[i3].newLine || current + width > 24) {
+          current = width;
+        } else if (current + width == 24) {
+          current = 0;
+        } else {
+          current = current + width;
+        }
+      }
+      return current == 0 ? 0 : 100 * (24 - current) / 24;
+    },
+    mouseover(column) {
+      if (!this.dragging) {
+        column._editable = true;
+      }
+    },
+    mouseleave(column) {
+      if (!this.dragging) {
+        column._editable = false;
+      }
+    },
+    start(evt) {
+      this.draggingColumn = this.columns[evt.oldIndex];
+      this.draggingColumn._actived = true;
+      this.draggingColumn._editable = false;
+      this.dragging = true;
+    },
+    end(evt) {
+      this.draggingColumn._actived = false;
+      this.dragging = false;
     }
   }
 };
 const _hoisted_1$f = ["onMouseover", "onMouseleave"];
-const _hoisted_2$d = { style: { "float": "right", "margin-right": "20px" } };
-const _hoisted_3$b = ["innerHTML"];
-const _hoisted_4$4 = { key: 2 };
-const _hoisted_5$3 = { class: "title" };
-const _hoisted_6$2 = { key: 3 };
-const _hoisted_7$2 = { class: "title" };
-const _hoisted_8$2 = ["title"];
-const _hoisted_9$1 = ["innerHTML"];
-const _hoisted_10$1 = ["href", "target"];
-const _hoisted_11$1 = ["innerHTML"];
+const _hoisted_2$d = { style: { "position": "absolute", "z-index": "100", "top": "4px", "right": "4px" } };
+const _hoisted_3$b = { key: 2 };
+const _hoisted_4$4 = { class: "title" };
+const _hoisted_5$3 = { key: 3 };
+const _hoisted_6$2 = { class: "title" };
+const _hoisted_7$2 = ["title"];
+const _hoisted_8$2 = ["innerHTML"];
+const _hoisted_9$1 = ["target"];
+const _hoisted_10$1 = ["innerHTML"];
 function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Button = resolveComponent("Button");
   const _component_Divider = resolveComponent("Divider");
@@ -49503,32 +49647,36 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
           animation: 500,
           scroll: true,
           group: "sort",
-          ghostClass: "ghost-style"
+          onStart: $options.start,
+          onEnd: $options.end,
+          style: { "display": "flex", "flex-flow": "row wrap" }
         }, {
           item: withCtx(({ element: column, index: index2 }) => [
             createElementVNode("div", {
-              style: normalizeStyle$1("width:" + $options.getWidth(column) + "%; float:left;"),
+              style: normalizeStyle$1([
+                { "position": "relative", "min-height": "1px" },
+                "flex: 0 0 " + $options.getWidth(column) + "%; max-width:" + $options.getWidth(column) + "%;" + (column._actived ? "border: dashed #ddd 1px; background-color: #ffefd5;" : "") + (index2 < $data.columns.length - 1 && $data.columns[index2 + 1].newLine ? "margin-right: " + $options.getRightWidth(index2) + "%" : "")
+              ]),
               onMouseover: ($event) => $options.mouseover(column),
               onMouseleave: ($event) => $options.mouseleave(column)
             }, [
               createElementVNode("div", _hoisted_2$d, [
-                withDirectives(createVNode$1(_component_Button, {
+                column._editable ? (openBlock(), createBlock(_component_Button, {
+                  key: 0,
                   size: "small",
                   onClick: ($event) => $options.edit(column, index2),
                   icon: "md-cog",
                   type: "primary",
                   style: { "margin-right": "4px", "width": "22px", "height": "22px" }
-                }, null, 8, ["onClick"]), [
-                  [vShow, column.showButton]
-                ]),
+                }, null, 8, ["onClick"])) : createCommentVNode("v-if", true),
                 withDirectives(createVNode$1(_component_Button, {
                   size: "small",
                   onClick: ($event) => $options.remove(column, index2),
                   icon: "md-close",
                   type: "warning",
-                  style: { "margin-right": "4px", "width": "22px", "height": "22px" }
+                  style: { "width": "22px", "height": "22px" }
                 }, null, 8, ["onClick"]), [
-                  [vShow, column.showButton]
+                  [vShow, column._editable]
                 ])
               ]),
               column.controlType === "Placeholder" ? (openBlock(), createElementBlock("div", {
@@ -49540,11 +49688,10 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
               }, [
                 createElementVNode("div", {
                   class: "form-title",
-                  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
-                  innerHTML: column.name
-                }, null, 12, _hoisted_3$b)
+                  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" })
+                }, toDisplayString$1($options.getNameI18n(column)) + " " + toDisplayString$1(_ctx.showData($data.data, column)), 5)
               ])) : createCommentVNode("v-if", true),
-              column.controlType === "Table" ? (openBlock(), createElementBlock("div", _hoisted_4$4, [
+              column.controlType === "Table" ? (openBlock(), createElementBlock("div", _hoisted_3$b, [
                 createVNode$1(_component_Divider, {
                   plain: true,
                   dashed: "",
@@ -49552,7 +49699,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                   size: "small"
                 }, {
                   default: withCtx(() => [
-                    createElementVNode("span", _hoisted_5$3, toDisplayString$1(column.name), 1)
+                    createElementVNode("span", _hoisted_4$4, toDisplayString$1($options.getNameI18n(column)), 1)
                   ]),
                   _: 2
                 }, 1024),
@@ -49563,7 +49710,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                   embedded: true
                 }, null, 8, ["view-code", "readonly"])
               ])) : createCommentVNode("v-if", true),
-              column.controlType === "List" ? (openBlock(), createElementBlock("div", _hoisted_6$2, [
+              column.controlType === "List" ? (openBlock(), createElementBlock("div", _hoisted_5$3, [
                 createVNode$1(_component_Divider, {
                   plain: true,
                   dashed: "",
@@ -49571,7 +49718,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                   size: "small"
                 }, {
                   default: withCtx(() => [
-                    createElementVNode("span", _hoisted_7$2, toDisplayString$1(column.name), 1)
+                    createElementVNode("span", _hoisted_6$2, toDisplayString$1($options.getNameI18n(column)), 1)
                   ]),
                   _: 2
                 }, 1024),
@@ -49583,9 +49730,10 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                 }, null, 8, ["view-code"])
               ])) : createCommentVNode("v-if", true),
               column.controlType !== "Placeholder" && column.controlType !== "Title" && column.controlType !== "Table" && column.controlType !== "List" ? (openBlock(), createBlock(_component_FormItem, {
-                label: column.name,
+                label: $options.getNameI18n(column),
                 prop: column.code,
                 key: column.code,
+                rules: $options.getRules(column),
                 error: column.code == null ? _ctx.$t("Front_Label_Column_Not_Bind") : null
               }, {
                 default: withCtx(() => [
@@ -49597,17 +49745,17 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     createElementVNode("div", {
                       class: normalizeClass({ error: $data.compareData != null && _ctx.parseData($data.data, column.code) != _ctx.parseData($data.compareData, column.code) }),
                       innerHTML: _ctx.showData($data.data, column)
-                    }, null, 10, _hoisted_9$1)
-                  ], 8, _hoisted_8$2)) : createCommentVNode("v-if", true),
+                    }, null, 10, _hoisted_8$2)
+                  ], 8, _hoisted_7$2)) : createCommentVNode("v-if", true),
                   column.controlType === "Hyperlink" ? (openBlock(), createElementBlock("a", {
                     key: 2,
-                    href: _ctx.getHyperlink($data.data, column.hyperlink),
+                    href: "#",
                     target: column.isNewWindow ? "_blank" : ""
                   }, [
                     createElementVNode("span", {
                       innerHTML: _ctx.showData($data.data, column)
-                    }, null, 8, _hoisted_11$1)
-                  ], 8, _hoisted_10$1)) : column.controlType === "TextInput" ? (openBlock(), createBlock(_component_Input, {
+                    }, null, 8, _hoisted_10$1)
+                  ], 8, _hoisted_9$1)) : column.controlType === "TextInput" ? (openBlock(), createBlock(_component_Input, {
                     key: 3,
                     type: "text",
                     "model-value": _ctx.parseData($data.data, column.code),
@@ -49958,11 +50106,11 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                   ], 64)) : createCommentVNode("v-if", true)
                 ]),
                 _: 2
-              }, 1032, ["label", "prop", "error"])) : createCommentVNode("v-if", true)
+              }, 1032, ["label", "prop", "rules", "error"])) : createCommentVNode("v-if", true)
             ], 44, _hoisted_1$f)
           ]),
           _: 1
-        }, 8, ["modelValue"])
+        }, 8, ["modelValue", "onStart", "onEnd"])
       ]),
       _: 1
     }, 8, ["model"]),
@@ -125810,7 +125958,7 @@ const created = async (app) => {
     window.$app.$Message = app.config.globalProperties.$Message;
     window.$app.$Notice = app.config.globalProperties.$Notice;
   }
-  await store.dispatch("admin/i18n/load", app);
+  store.dispatch("admin/i18n/load", app);
   store.commit("admin/menu/setHeader", menuHeader);
   store.dispatch("admin/account/load");
   store.dispatch("admin/layout/listenFullscreen");