@web-utils/component 2.8.26 → 2.8.28

package/form-input-tag/index.mjs

@@ -1,66 +1,70 @@
-var i = Object.defineProperty;
+var p = Object.defineProperty;
 var a = Object.getOwnPropertySymbols;
-var p = Object.prototype.hasOwnProperty, c = Object.prototype.propertyIsEnumerable;
-var l = (r, e, t) => e in r ? i(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, n = (r, e) => {
-  for (var t in e || (e = {}))
-    p.call(e, t) && l(r, t, e[t]);
+var c = Object.prototype.hasOwnProperty, m = Object.prototype.propertyIsEnumerable;
+var l = (e, r, t) => r in e ? p(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t, n = (e, r) => {
+  for (var t in r || (r = {}))
+    c.call(r, t) && l(e, t, r[t]);
   if (a)
-    for (var t of a(e))
-      c.call(e, t) && l(r, t, e[t]);
-  return r;
+    for (var t of a(r))
+      m.call(r, t) && l(e, t, r[t]);
+  return e;
 };
-import { f as m } from "../chunks/form-input-mixin.4632ad36.mjs";
-import { d, n as f } from "../chunks/index.57f871af.mjs";
-import _ from "@web-utils/component/x-input-tag";
+import { f as d } from "../chunks/form-input-mixin.4632ad36.mjs";
+import { d as f, n as _ } from "../chunks/index.57f871af.mjs";
+import s from "@web-utils/component/x-input-tag";
 import "@web-utils/component/x-input-tag/style.css";
 import { n as y } from "../chunks/vueComponentNormalizer.446f5dc4.mjs";
-var v = function() {
-  var r = this, e = r.$createElement, t = r._self._c || e;
-  return t("FormItem", r._b({
+var b = function() {
+  var e = this, r = e.$createElement, t = e._self._c || r;
+  return t("FormItem", e._b({
     attrs: {
-      block: r.block,
-      rules: r.computeRules,
-      disabled: r.inputDisabled
+      block: e.block,
+      rules: e.computeRules,
+      disabled: e.inputDisabled
     },
-    scopedSlots: r._u([{
+    scopedSlots: e._u([{
       key: "default",
       fn: function() {
-        return [t("XInputTag", r._g(r._b({
+        return [t("XInputTag", e._g(e._b({
           attrs: {
-            value: r.value,
-            readonly: r.readonly,
-            disabled: r.inputDisabled,
-            placeholder: r.computePlaceholder,
-            "array-mode": r.arrayMode
+            value: e.value,
+            readonly: e.readonly,
+            disabled: e.inputDisabled,
+            placeholder: e.computePlaceholder,
+            "array-mode": e.arrayMode,
+            "object-mode": e.objectMode
           },
           on: {
             input: function(o) {
-              return r.$emit("input", o);
+              return e.$emit("input", o);
             }
           }
-        }, "XInputTag", r.inputProps, !1), r.listeners))];
+        }, "XInputTag", e.inputProps, !1), e.listeners))];
       },
       proxy: !0
     }, {
       key: "error",
       fn: function(o) {
-        var s = o.error;
-        return [r._t("error", null, {
-          error: s
+        var i = o.error;
+        return [e._t("error", null, {
+          error: i
         })];
       }
     }, {
       key: "label",
       fn: function() {
-        return [r._t("label")];
+        return [e._t("label")];
       },
       proxy: !0
     }], null, !0)
-  }, "FormItem", r.formItemProps, !1));
-}, b = [];
-const I = Object.keys(_.props).filter((r) => !["value", "placeholder", "disabled"].includes(r)), h = {
+  }, "FormItem", e.formItemProps, !1));
+}, v = [];
+const I = Object.keys(s.props).filter((e) => !["value", "placeholder", "disabled"].includes(e)), h = {
   name: "FormInputTag",
-  mixins: [m],
+  components: {
+    XInputTag: s
+  },
+  mixins: [d],
   props: {
     value: [Array, String],
     block: {
@@ -70,27 +74,31 @@ const I = Object.keys(_.props).filter((r) => !["value", "placeholder", "disabled
     arrayMode: {
       type: Boolean,
       default: !0
+    },
+    objectMode: {
+      type: Boolean,
+      default: !0
     }
   },
   computed: {
     inputProps() {
-      return d(n(n({}, f(this.$attrs)), this.$props), I);
+      return f(n(n({}, _(this.$attrs)), this.$props), I);
     }
   }
 }, u = {};
 var g = /* @__PURE__ */ y(
   h,
-  v,
   b,
+  v,
   !1,
   k,
   null,
   null,
   null
 );
-function k(r) {
-  for (let e in u)
-    this[e] = u[e];
+function k(e) {
+  for (let r in u)
+    this[r] = u[r];
 }
 const B = /* @__PURE__ */ function() {
   return g.exports;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@web-utils/component",
   "description": "Web Components",
-  "version": "2.8.26",
+  "version": "2.8.28",
   "author": "Simple",
   "license": "MIT",
   "type": "module",

package/tag-render/index.mjs

@@ -31,7 +31,9 @@ var f = function() {
     }, [e._v(" " + e._s(e.getTagName(s)) + " ")]);
   }) : e.enable ? e._e() : [n("span", {
     staticStyle: {
-      color: "#b5b5b5"
+      color: "#b5b5b5",
+      "line-height": "16px",
+      "margin-left": "4px"
     }
   }, [e._v("无")])], e.enable ? n("ElButton", {
     staticClass: "add-tag",
@@ -92,22 +94,22 @@ const p = {
     }
   }
 }, u = {};
-var v = /* @__PURE__ */ g(
+var h = /* @__PURE__ */ g(
   p,
   f,
   d,
   !1,
-  h,
+  v,
   null,
   null,
   null
 );
-function h(e) {
+function v(e) {
   for (let t in u)
     this[t] = u[t];
 }
 const $ = /* @__PURE__ */ function() {
-  return v.exports;
+  return h.exports;
 }();
 export {
   $ as default

package/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/web-types",
   "framework": "vue",
   "name": "@web-utils/component",
-  "version": "2.8.26",
+  "version": "2.8.28",
   "contributions": {
     "html": {
       "description-markup": "markdown",
@@ -5894,6 +5894,14 @@
                 "type": "boolean"
               },
               "default": "true"
+            },
+            {
+              "name": "objectMode",
+              "value": {
+                "kind": "expression",
+                "type": "boolean"
+              },
+              "default": "true"
             }
           ],
           "events": [
@@ -20086,6 +20094,14 @@
               },
               "default": "','"
             },
+            {
+              "name": "count",
+              "value": {
+                "kind": "expression",
+                "type": "boolean"
+              },
+              "default": "true"
+            },
             {
               "name": "arrayMode",
               "value": {
@@ -20093,6 +20109,14 @@
                 "type": "boolean"
               },
               "default": "true"
+            },
+            {
+              "name": "objectMode",
+              "value": {
+                "kind": "expression",
+                "type": "boolean"
+              },
+              "default": "true"
             }
           ],
           "events": [

package/x-input-tag/index.mjs

@@ -1,71 +1,82 @@
 var f = Object.defineProperty, _ = Object.defineProperties;
-var v = Object.getOwnPropertyDescriptors;
+var b = Object.getOwnPropertyDescriptors;
 var p = Object.getOwnPropertySymbols;
-var y = Object.prototype.hasOwnProperty, b = Object.prototype.propertyIsEnumerable;
-var h = (t, a, e) => a in t ? f(t, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[a] = e, m = (t, a) => {
-  for (var e in a || (a = {}))
-    y.call(a, e) && h(t, e, a[e]);
+var v = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
+var h = (t, s, e) => s in t ? f(t, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[s] = e, d = (t, s) => {
+  for (var e in s || (s = {}))
+    v.call(s, e) && h(t, e, s[e]);
   if (p)
-    for (var e of p(a))
-      b.call(a, e) && h(t, e, a[e]);
+    for (var e of p(s))
+      y.call(s, e) && h(t, e, s[e]);
   return t;
-}, d = (t, a) => _(t, v(a));
-var u = (t, a, e) => new Promise((s, n) => {
-  var o = (i) => {
+}, c = (t, s) => _(t, b(s));
+var r = (t, s, e) => new Promise((a, i) => {
+  var o = (n) => {
     try {
-      l(e.next(i));
-    } catch (r) {
-      n(r);
+      l(e.next(n));
+    } catch (u) {
+      i(u);
     }
-  }, c = (i) => {
+  }, g = (n) => {
     try {
-      l(e.throw(i));
-    } catch (r) {
-      n(r);
+      l(e.throw(n));
+    } catch (u) {
+      i(u);
     }
-  }, l = (i) => i.done ? s(i.value) : Promise.resolve(i.value).then(o, c);
-  l((e = e.apply(t, a)).next());
+  }, l = (n) => n.done ? a(n.value) : Promise.resolve(n.value).then(o, g);
+  l((e = e.apply(t, s)).next());
 });
 import { n as V } from "../chunks/vueComponentNormalizer.446f5dc4.mjs";
 var w = function() {
-  var t = this, a = t.$createElement, e = t._self._c || a;
+  var t = this, s = t.$createElement, e = t._self._c || s;
   return e("div", {
-    staticClass: "fy-input-tag"
-  }, [t._l(t.tags, function(s, n) {
+    staticClass: "x-input-tag"
+  }, [t.tags && t.tags.length && t.tags[0] ? t._l(t.tags, function(a, i) {
     return e("ElTag", {
-      key: s.id,
+      key: a.id || a,
       attrs: {
-        closable: !t.inputDisabled,
-        "disable-transitions": !t.arrayMode
+        size: "medium",
+        "disable-transitions": "",
+        closable: !t.inputDisabled
       },
       on: {
         close: function(o) {
-          return t.handleClose(s, n);
+          return t.handleClose(a, i);
         }
       }
-    }, [t._v(" " + t._s(s.tagName) + " ")]);
-  }), !t.inputDisabled && t.inputVisible ? e("ElInput", {
+    }, [t._v(" " + t._s(a.name || a) + " ")]);
+  }) : t.inputDisabled ? [e("span", {
+    staticStyle: {
+      color: "#b5b5b5"
+    }
+  }, [t._v("无")])] : t._e(), t.inputDisabled ? t._e() : e("ElInput", {
+    directives: [{
+      name: "show",
+      rawName: "v-show",
+      value: t.inputVisible,
+      expression: "inputVisible"
+    }],
     ref: "saveTagInput",
     staticClass: "input-new-tag",
     attrs: {
-      size: "small"
+      size: "mini"
     },
     on: {
       blur: t.handleInputConfirm
     },
     nativeOn: {
-      keyup: function(s) {
-        return !s.type.indexOf("key") && t._k(s.keyCode, "enter", 13, s.key, "Enter") ? null : t.handleInputConfirm.apply(null, arguments);
+      keyup: function(a) {
+        return !a.type.indexOf("key") && t._k(a.keyCode, "enter", 13, a.key, "Enter") ? null : t.handleInputConfirm.apply(null, arguments);
       }
     },
     model: {
       value: t.inputValue,
-      callback: function(s) {
-        t.inputValue = s;
+      callback: function(a) {
+        t.inputValue = a;
       },
       expression: "inputValue"
     }
-  }) : t._e(), !t.inputDisabled && !t.inputVisible ? e("ElButton", {
+  }), !t.inputDisabled && !t.inputVisible ? e("ElButton", {
     directives: [{
       name: "show",
       rawName: "v-show",
@@ -74,14 +85,16 @@ var w = function() {
     }],
     staticClass: "button-new-tag",
     attrs: {
-      size: "small"
+      size: "mini"
     },
     on: {
       click: t.showInput
     }
-  }, [t._v(" + 添加 ")]) : t._e()], 2);
+  }, [t._v(" + 添加 ")]) : t._e(), t.count ? e("span", {
+    staticClass: "tags-count"
+  }, [t._v(t._s(t.tags.length && t.tags[0] ? t.tags.length : ""))]) : t._e()], 2);
 }, x = [];
-const I = {
+const C = {
   name: "XInputTag",
   inject: {
     elForm: {
@@ -101,9 +114,17 @@ const I = {
       type: String,
       default: ","
     },
+    count: {
+      type: Boolean,
+      default: !0
+    },
     arrayMode: {
       type: Boolean,
       default: !0
+    },
+    objectMode: {
+      type: Boolean,
+      default: !0
     }
   },
   data() {
@@ -119,49 +140,49 @@ const I = {
     },
     tags: {
       get() {
-        var t, a;
+        var t, s;
         if (this.arrayMode)
-          return (t = this.value) != null && t.length ? this.value.map((e) => e.id > 0 ? e : d(m({}, e), { id: Math.random() })) : [];
+          return (t = this.value) != null && t.length ? this.objectMode ? this.value.map((e) => e.id > 0 ? e : c(d({}, e), { id: Math.random() })) : this.value : [];
         {
-          const e = ((a = this.value) == null ? void 0 : a.split(this.separator)) || [];
-          return e.length && e[0] ? e.map((s) => ({ tagName: s, id: Math.random() })) : [];
+          const e = ((s = this.value) == null ? void 0 : s.split(this.separator)) || [];
+          return e.length && e[0] ? e.map((a) => this.objectMode ? { name: a, id: Math.random() } : a) : [];
         }
       }
     }
   },
   methods: {
     showInput() {
-      return u(this, null, function* () {
+      return r(this, null, function* () {
         this.inputVisible = !0, yield this.$nextTick(), this.$refs.saveTagInput.$refs.input.focus();
       });
     },
     handleClose(t) {
-      const a = this.tags.filter((e) => e !== t);
-      this.$emit("input", this.arrayMode ? a : a.map((e) => e.tagName).join(this.separator));
+      const s = this.tags.filter((e) => e !== t);
+      this.$emit("input", this.arrayMode ? s : s.map((e) => e.name || e).join(this.separator));
     },
     handleInputConfirm() {
-      return u(this, null, function* () {
-        var a;
+      return r(this, null, function* () {
+        var s;
         if (this.tags.length >= this.maxTag) {
           this.$message.warning({ message: "标签已达上限,请删除一些标签再添加！", showClose: !0 }), this.inputVisible = !1, this.inputValue = "";
           return;
         }
         const t = this.inputValue;
         if (t) {
-          if (this.tags.some((s) => s.tagName === t)) {
+          if (this.tags.some((a) => (a.name || a) === t)) {
             this.inputVisible = !1, this.inputValue = "", this.$message.warning({ message: "标签已存在！", showClose: !0 });
             return;
           }
           const e = [...this.tags];
-          e.push({ id: Date.now(), tagName: this.inputValue }), this.$emit("input", this.arrayMode ? e : e.map((s) => s.tagName).join(this.separator)), yield this.$nextTick(), (a = this.elFormItem) == null || a.clearValidate();
+          e.push(this.objectMode ? { id: Date.now(), name: this.inputValue } : this.inputValue), this.$emit("input", this.arrayMode ? e : e.map((a) => a.name || a).join(this.separator)), yield this.$nextTick(), (s = this.elFormItem) == null || s.clearValidate();
         }
         this.inputVisible = !1, this.inputValue = "";
       });
     }
   }
-}, g = {};
-var C = /* @__PURE__ */ V(
-  I,
+}, m = {};
+var I = /* @__PURE__ */ V(
+  C,
   w,
   x,
   !1,
@@ -171,12 +192,12 @@ var C = /* @__PURE__ */ V(
   null
 );
 function T(t) {
-  for (let a in g)
-    this[a] = g[a];
+  for (let s in m)
+    this[s] = m[s];
 }
-const $ = /* @__PURE__ */ function() {
-  return C.exports;
+const j = /* @__PURE__ */ function() {
+  return I.exports;
 }();
 export {
-  $ as default
+  j as default
 };

package/x-input-tag/style.css

@@ -1 +1 @@
-.el-form-item.is-error .fy-input-tag{border-color:#f56c6c}.fy-input-tag{height:120px;padding:0 10px 10px;overflow:auto;border:1px solid var(--border-color);border-radius:4px}.fy-input-tag .el-tag{margin-top:10px;margin-right:10px}.fy-input-tag .el-tag+.el-tag{margin-right:10px}.fy-input-tag .button-new-tag{height:28px;margin-top:10px;padding-top:0;padding-bottom:0;line-height:26px}.fy-input-tag .el-input.input-new-tag{width:170px;height:28px;margin-top:10px;line-height:26px;vertical-align:bottom}
+.el-form-item.is-error .x-input-tag{border-color:#f56c6c}.x-input-tag{height:120px;overflow:auto;border:1px solid var(--border-color);border-radius:4px;line-height:0;padding-top:4px;padding-right:4px}.x-input-tag .el-tag .el-tag__close:hover{background-color:#ee8677}.x-input-tag .el-tag,.x-input-tag .button-new-tag{margin-left:4px;margin-bottom:4px}.x-input-tag .el-input.input-new-tag{width:120px;margin-left:4px;margin-bottom:4px}.x-input-tag .tags-count{position:absolute;right:6px;bottom:10px;color:#b7b7b7;font-size:.9em}