magtool 1.5.0 → 1.5.2

package/README.1.md

@@ -1,5 +1,8 @@
 # magtool
 
+1.5.0
+增加Mvc与Super组件
+
 1.4.2
 color#border-inline
 

package/dist/component.js

@@ -1,6 +1,6 @@
-import { createElementBlock as M, openBlock as p, normalizeStyle as se, unref as t, createCommentVNode as B, createElementVNode as c, normalizeClass as G, renderSlot as H, toDisplayString as I, createVNode as N, markRaw as ve, resolveComponent as D, mergeProps as K, withCtx as _, resolveDirective as _e, withDirectives as be, createBlock as Y, withKeys as ye, createSlots as ee, Fragment as oe, renderList as le, createTextVNode as te, defineComponent as we, reactive as $e, onBeforeMount as Se, withModifiers as ie, resolveDynamicComponent as Ce, nextTick as pe } from "vue";
+import { createElementBlock as M, openBlock as p, normalizeStyle as se, unref as t, createCommentVNode as B, createElementVNode as c, normalizeClass as G, renderSlot as H, toDisplayString as I, resolveComponent as D, createVNode as N, markRaw as we, mergeProps as K, withCtx as _, resolveDirective as be, withDirectives as ve, createBlock as Y, withKeys as ye, createSlots as ee, Fragment as oe, renderList as le, createTextVNode as te, defineComponent as $e, reactive as Se, onBeforeMount as Ce, withModifiers as ie, resolveDynamicComponent as ke, nextTick as pe } from "vue";
 import { _ as ae } from "./vendor.js";
-import { dayjs as ke, ElDatePicker as xe } from "element-plus";
+import { dayjs as xe } from "element-plus";
 import { u as Ve } from "./composition.js";
 import me from "vuedraggable";
 const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
@@ -148,7 +148,7 @@ const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
   },
   emits: ["change", "update:modelValue"],
   setup(A, { expose: x, emit: s }) {
-    ke.en.weekStart = 7;
+    xe.en.weekStart = 7;
     const e = A, o = reactive({
       type: "",
       date: [],
@@ -304,29 +304,32 @@ const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
       }
     ), x({
       setDate: d
-    }), (l, n) => (p(), M("div", Ae, [
-      N(t(xe), {
-        modelValue: t(o).date,
-        "onUpdate:modelValue": n[0] || (n[0] = (S) => t(o).date = S),
-        class: "wp100",
-        "popper-class": t(i),
-        type: "daterange",
-        "value-format": "YYYY-MM-DD",
-        editable: !1,
-        size: e.size,
-        clearable: !1,
-        "range-separator": e.separator,
-        shortcuts: t(o).shortBtn,
-        "end-placeholder": l.$l(t(z).end),
-        "start-placeholder": l.$l(t(z).start),
-        "disabled-date": a,
-        placement: e.placement,
-        disabled: e.disabled,
-        source: e.source,
-        onChange: k,
-        onCalendarChange: y
-      }, null, 8, ["modelValue", "popper-class", "size", "range-separator", "shortcuts", "end-placeholder", "start-placeholder", "placement", "disabled", "source"])
-    ]));
+    }), (l, n) => {
+      const S = D("el-date-picker");
+      return p(), M("div", Ae, [
+        N(S, {
+          modelValue: t(o).date,
+          "onUpdate:modelValue": n[0] || (n[0] = (L) => t(o).date = L),
+          class: "wp100",
+          "popper-class": t(i),
+          type: "daterange",
+          "value-format": "YYYY-MM-DD",
+          editable: !1,
+          size: e.size,
+          clearable: !1,
+          "range-separator": e.separator,
+          shortcuts: t(o).shortBtn,
+          "end-placeholder": l.$l(t(z).end),
+          "start-placeholder": l.$l(t(z).start),
+          "disabled-date": a,
+          placement: e.placement,
+          disabled: e.disabled,
+          source: e.source,
+          onChange: k,
+          onCalendarChange: y
+        }, null, 8, ["modelValue", "popper-class", "size", "range-separator", "shortcuts", "end-placeholder", "start-placeholder", "placement", "disabled", "source"])
+      ]);
+    };
   }
 }), Ie = { class: "EChart" }, Ne = ["id"], ze = /* @__PURE__ */ Object.assign({
   name: "EChart"
@@ -418,7 +421,7 @@ const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
     onBeforeMount(() => {
       a.chartID = `chart${+/* @__PURE__ */ new Date()}${parseInt(Math.random() * 1e4)}`;
     }), onMounted(() => {
-      a.mounted = !0, a.chart = ve(
+      a.mounted = !0, a.chart = we(
         window.$echarts.init(o.$refs.chart, { renderer: "svg" })
       );
     });
@@ -760,9 +763,9 @@ const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
     ), x({
       focus: f
     }), (u, m) => {
-      const $ = D("el-input"), d = _e("focus");
+      const $ = D("el-input"), d = be("focus");
       return p(), M("div", Ue, [
-        be((p(), Y($, K({
+        ve((p(), Y($, K({
           ref: "input",
           modelValue: t(o).v,
           "onUpdate:modelValue": m[0] || (m[0] = (i) => t(o).v = i),
@@ -1297,7 +1300,7 @@ const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
       ])) : B("", !0)
     ], 4));
   }
-}), St = /* @__PURE__ */ ae($t, [["__scopeId", "data-v-3becf565"]]), Ct = we({
+}), St = /* @__PURE__ */ ae($t, [["__scopeId", "data-v-3becf565"]]), Ct = $e({
   name: "MvcTableColumnFilter",
   props: {
     tableName: {
@@ -1311,7 +1314,7 @@ const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
   },
   setup: (A, x) => {
     var y;
-    const s = $e({
+    const s = Se({
       options: [],
       slots: []
     }), e = A.tableName + "_Column";
@@ -1626,7 +1629,7 @@ const Te = { class: "fw700" }, Oe = /* @__PURE__ */ Object.assign({
     }), { proxy: h } = getCurrentInstance();
     inject("store").table();
     const y = ref();
-    Se(() => {
+    Ce(() => {
       o.tableId = `Table${+/* @__PURE__ */ new Date()}_${window.$rn(9999)}`;
     });
     const k = s, V = async (j = {}) => {
@@ -3102,7 +3105,7 @@ ${C.value}` : `${C.value}`), m = computed(() => r.value ? e.modelValue.join(e.se
     return (y, k) => (p(), M("div", {
       class: G(["SuperCountry", o.nowrap && "nowrap"])
     }, [
-      (p(), Y(Ce(t(h)), K(y.$attrs, {
+      (p(), Y(ke(t(h)), K(y.$attrs, {
         "collapse-tags": t(a),
         "collapse-tags-tooltip": t(a)
       }), null, 16, ["collapse-tags", "collapse-tags-tooltip"]))
@@ -3393,7 +3396,7 @@ ${C.value}` : `${C.value}`), m = computed(() => r.value ? e.modelValue.join(e.se
       ]);
     };
   }
-}), Zl = {
+}), _e = {
   Card: Me,
   DatePicker: De,
   EChart: je,
@@ -3416,6 +3419,9 @@ ${C.value}` : `${C.value}`), m = computed(() => r.value ? e.modelValue.join(e.se
   Org: Go,
   StatusItem: Jo,
   StatusSelect: Wo
+}, Zl = (A) => {
+  for (let x in _e)
+    A.component(x, _e[x]);
 }, qo = { class: "dragCenter flexMode vc flexGrow txt-nowrap" }, Zo = { class: "pl10 fs14 txt-h2" }, Qo = { class: "pb5 fs12 txt-primary3" }, Xo = /* @__PURE__ */ Object.assign({
   name: "ColumnConfigDragItem"
 }, {
@@ -3883,7 +3889,7 @@ ${C.value}` : `${C.value}`), m = computed(() => r.value ? e.modelValue.join(e.se
       return e.items.length === 0 || g.value.length === 0 || !!((l = s.params) != null && l.loading);
     });
     return (l, n) => {
-      const S = D("el-checkbox"), L = D("el-button"), R = D("Alert"), U = D("el-switch"), Z = D("el-checkbox-group"), W = D("el-input"), P = D("DrawerArea"), ne = _e("loading");
+      const S = D("el-checkbox"), L = D("el-button"), R = D("Alert"), U = D("el-switch"), Z = D("el-checkbox-group"), W = D("el-input"), P = D("DrawerArea"), ne = be("loading");
       return p(), Y(P, { onSubmit: C }, {
         footer: _(() => [
           c("div", Il, [
@@ -3918,7 +3924,7 @@ ${C.value}` : `${C.value}`), m = computed(() => r.value ? e.modelValue.join(e.se
           ])
         ]),
         default: _(() => [
-          be((p(), M("div", bl, [
+          ve((p(), M("div", bl, [
             N(R, null, {
               default: _(() => [
                 c("div", vl, [

package/dist/index.js

@@ -3,11 +3,10 @@ import "markdown-it";
 import "echarts";
 import "bignumber.js";
 import "./util.js";
-import "element-plus";
 import "./directive.js";
 import "./store.js";
 import "./component.js";
-import { i as s } from "./vendor.js";
+import { i as l } from "./vendor.js";
 export {
-  s as default
+  l as default
 };

package/dist/vendor.js

@@ -1,31 +1,28 @@
 import s from "moment";
-import n from "markdown-it";
-import * as a from "echarts";
-import c from "bignumber.js";
-import { d as l } from "./util.js";
-import p from "element-plus";
-import { d } from "./directive.js";
-import { p as f } from "./store.js";
-import { c as i } from "./component.js";
-const S = (t, e) => {
-  const r = t.__vccOpts || t;
-  for (const [_, o] of e)
-    r[_] = o;
+import m from "markdown-it";
+import * as n from "echarts";
+import a from "bignumber.js";
+import { d as c } from "./util.js";
+import { d as p } from "./directive.js";
+import { p as d } from "./store.js";
+import { c as l } from "./component.js";
+const y = (o, t) => {
+  const r = o.__vccOpts || o;
+  for (const [e, _] of t)
+    r[e] = _;
   return r;
-}, $ = (t, e) => {
-  t.use(p, {
-    ...e.elementOptions || {}
-  }).use(l).use(d);
+}, v = (o, t) => {
+  o.use(c).use(p).use(l);
   let r;
-  if (e.storeChips)
+  if (t.storeChips)
     try {
-      const { store: o, pinia: m } = f(e.storeChips);
-      r = o, t.provide("store", o).use(m);
+      const { store: _, pinia: i } = d(t.storeChips);
+      r = _, o.provide("store", _).use(i);
     } catch {
       throw new Error("RangeError: Maximum call stack size exceeded");
     }
-  const _ = localStorage.getItem("lang");
-  _ && _.includes("cn") && s.locale("zh-cn", {
+  const e = localStorage.getItem("lang");
+  e && e.includes("cn") && s.locale("zh-cn", {
     months: "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split(
       "_"
     ),
@@ -35,11 +32,9 @@ const S = (t, e) => {
     weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
     weekdaysShort: "周日_周一_周二_周三_周四_周五_周六".split("_"),
     weekdaysMin: "日_一_二_三_四_五_六".split("_")
-  }), window.$m = s, window.$md = n, window.$ecs = a, window.$bn = c;
-  for (let o in i)
-    t.component(o, i[o]);
+  }), window.$m = s, window.$md = m, window.$ecs = n, window.$bn = a;
 };
 export {
-  S as _,
-  $ as i
+  y as _,
+  v as i
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "magtool",
   "packageManager": "yarn@4.4.1",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "author": "matt avis",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -15,10 +15,6 @@
       "import": "./dist/composition.js",
       "require": "./dist/composition.js"
     },
-    "./cpt": {
-      "import": "./dist/component.js",
-      "require": "./dist/component.js"
-    },
     "./store": {
       "import": "./dist/store.js",
       "require": "./dist/store.js"