fast-crud-ui3 1.5.17 → 1.5.18-beta

package/lib/fast-crud-ui3.es.js

@@ -9643,18 +9643,21 @@ const Xr = class Xr {
    * 向内置条件组中增加条件
    * @param cond
    * @param repeatable 是否允许重复的col, 默认false, 即若多次添加相同col的条件, 只会保留最新的
+   * @return {FastTableOption} 返回当前对象
    */
   addCond(t, n = !1) {
     const r = ct.build(t);
-    n === !1 && this.removeCond(r.col), this.conds.push(r);
+    return n === !1 && this.removeCond(r.col), this.conds.push(r), this;
   }
   /**
    * 从内置条件组中移除条件
-   * @param col
+   * @param col {string} 字段名
+   * @return {FastTableOption} 返回当前对象
    */
   removeCond(t) {
     for (let n = this.conds.length - 1; n >= 0; n--)
       this.conds[n].col === t && this.conds.splice(n, 1);
+    return this;
   }
   /**
    * 新增行, 返回promise
@@ -9817,26 +9820,27 @@ const Xr = class Xr {
    * @param query
    * @param valKey
    * @param labelKey
+   * @param forceRefresh 是否强制刷新，若true则跳过缓存
    * @return {Promise<*>}
    */
-  _buildSelectOptions(t, n, r) {
-    return new Promise((s, o) => {
-      const l = `OPTIONS:${this.id}_${n}_${r}_` + r3(JSON.stringify(zo(t)));
-      let u = Wh(l);
-      if (Ne(u))
+  _buildSelectOptions(t, n, r, s = !1) {
+    return new Promise((o, l) => {
+      const u = `OPTIONS:${this.id}_${n}_${r}_` + r3(JSON.stringify(zo(t)));
+      let f;
+      if (s || (f = Wh(u)), Ne(f))
         try {
-          s(u);
+          o(f);
           return;
-        } catch (f) {
-          console.log(f), Ho(l);
+        } catch (m) {
+          console.log(m), Ho(u);
         }
-      this._list(t).then((f) => {
-        u = f.filter((m) => ce(m)).map((m) => {
-          const h = {};
-          return h[n] = m[n], h[r] = m[r], h;
-        }), Uh(l, u, 1), s(u);
-      }).catch((f) => {
-        o(f);
+      this._list(t).then((m) => {
+        f = m.filter((h) => ce(h)).map((h) => {
+          const g = {};
+          return g[n] = h[n], g[r] = h[r], g;
+        }), Uh(u, f, 1), o(f);
+      }).catch((m) => {
+        l(m);
       });
     });
   }
@@ -10129,7 +10133,7 @@ const j3 = {
     };
   },
   async mounted() {
-    this.options instanceof ze && await this.buildSelectOptions();
+    this.options instanceof ze && (this.options.ref = this, await this.getOptions());
   },
   computed: {
     value: {
@@ -10142,14 +10146,14 @@ const j3 = {
     }
   },
   methods: {
-    buildSelectOptions() {
+    getOptions(e = !1) {
       if (!(this.options instanceof ze))
         return;
-      const e = new yi().setDistinct().setCols([this.valKey, this.labelKey]);
-      this.options._buildSelectOptions(e, this.valKey, this.labelKey).then((t) => {
-        this.nativeOptions = t;
-      }).catch((t) => {
-        console.error(t);
+      const t = new yi().setDistinct().setCols([this.valKey, this.labelKey]);
+      this.options._buildSelectOptions(t, this.valKey, this.labelKey, e).then((n) => {
+        this.nativeOptions = n;
+      }).catch((n) => {
+        console.error(n);
       });
     }
   }
@@ -10531,7 +10535,7 @@ function X3(e, t, n, r, s, o) {
     _: 3
   }, 8, ["label-width", "style"]);
 }
-const e$ = /* @__PURE__ */ xe(J3, [["render", X3], ["__scopeId", "data-v-69969c93"]]);
+const e$ = /* @__PURE__ */ xe(J3, [["render", X3], ["__scopeId", "data-v-4ef6c2b5"]]);
 const t$ = {
   name: "easy-filter",
   components: { FastSelect: _r },
@@ -11287,6 +11291,8 @@ const vc = {
     clearable: !0,
     filterable: !0,
     multiple: !0,
+    collapseTags: !0,
+    // 默认合并
     placeholder: "请选择.."
   },
   condMapFn: (e) => Ne(e.val) && e.val.length > 0 ? [new ct(e.col, P.IN, e.val)] : Ph(e.val) ? [new ct(e.col, P.EQ, e.val)] : []
@@ -12241,7 +12247,7 @@ function Q$(e, t, n) {
       // deprecated: 1.6.0
       hidden: tt,
       showLength: Te,
-      // 对于FastTableColumn*中定义了的prop, 从leftProp中移除 TODO 1.5.16 针对FastTableColumn* props中定义的属性，而又不希望透传给内置控件的, 应当在FastTableColumn*中声明, 而不是在这里设置"黑名单"
+      // 对于FastTableColumn*中定义了的prop, 从leftProp中移除 TODO 1.5.19 针对FastTableColumn* props中定义的属性，而又不希望透传给内置控件的, 应当在FastTableColumn*中声明, 而不是在这里设置"黑名单"
       props: Z$(F, o, ["quickFilterCheckbox", "quickFilterBlock", "tableOption", "quickFilterConfig"])
       // props: leftProp
     };