@form-create/component-elm-group 2.7.8 → 2.7.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.es.js CHANGED
@@ -1,21 +1,21 @@
1
1
  /*!
2
2
  * FormCreate 低代码表单渲染器
3
- * @form-create/component-elm-group v2.7.8
4
- * (c) 2018-2025 xaboy
3
+ * @form-create/component-elm-group v2.7.27
4
+ * (c) 2018-2026 xaboy
5
5
  * Github https://github.com/xaboy/form-create
6
6
  * Site https://form-create.com/
7
7
  * Released under the MIT License.
8
8
  */
9
9
  (function(){"use strict";try{if(typeof document!="undefined"){var o=document.createElement("style");o.appendChild(document.createTextNode('._fc-group{display:flex;min-height:42px;justify-content:center;flex-direction:column}._fc-group-disabled ._fc-group-btn,._fc-group-disabled ._fc-group-add{cursor:not-allowed}._fc-group-handle{display:flex;flex-direction:row;position:absolute;bottom:-15px;right:30px;border-radius:15px;border:1px dashed #d9d9d9;padding:3px 8px;background-color:#fff}._fc-group-btn{cursor:pointer}._fc-group-idx{position:absolute;bottom:-15px;left:10px;width:30px;height:30px;display:flex;align-items:center;justify-content:center;background:#eee;border-radius:15px;font-weight:700}._fc-group-handle ._fc-group-btn+._fc-group-btn{margin-left:7px}._fc-group-container{position:relative;display:flex;flex-direction:column;border:1px dashed #d9d9d9;padding:20px 20px 25px;margin:5px 5px 25px;border-radius:5px}._fc-group-arrow{position:relative;width:20px;height:20px}._fc-group-arrow:before{content:"";position:absolute;top:8px;left:5px;width:9px;height:9px;border-left:2px solid #999;border-top:2px solid #999}._fc-group-arrow:before{transform:rotate(45deg)}._fc-group-arrow._fc-group-down{transform:rotate(180deg)}._fc-group-plus-minus{width:20px;height:20px;position:relative;cursor:pointer}._fc-group-plus-minus:before,._fc-group-plus-minus:after{content:"";position:absolute;top:50%;left:50%;width:60%;height:2px;background-color:#409eff;transform:translate(-50%,-50%)}._fc-group-plus-minus:before{transform:translate(-50%,-50%) rotate(90deg)}._fc-group-plus-minus._fc-group-minus:before{display:none}._fc-group-plus-minus._fc-group-minus:after{background-color:#f56c6c}._fc-group-add{cursor:pointer;width:25px;height:25px;border:1px solid rgb(64 158 255 / 50%);border-radius:15px}._fc-group-add._fc-group-plus-minus:before,._fc-group-add._fc-group-plus-minus:after{width:50%}')),document.head.appendChild(o)}}catch(r){console.error("vite-plugin-css-injected-by-js",r)}})();
10
10
  var O = Object.defineProperty;
11
- var v = Object.getOwnPropertySymbols;
11
+ var _ = Object.getOwnPropertySymbols;
12
12
  var j = Object.prototype.hasOwnProperty, R = Object.prototype.propertyIsEnumerable;
13
- var _ = (t, e, r) => e in t ? O(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, d = (t, e) => {
13
+ var $ = (t, e, r) => e in t ? O(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, d = (t, e) => {
14
14
  for (var r in e || (e = {}))
15
- j.call(e, r) && _(t, r, e[r]);
16
- if (v)
17
- for (var r of v(e))
18
- R.call(e, r) && _(t, r, e[r]);
15
+ j.call(e, r) && $(t, r, e[r]);
16
+ if (_)
17
+ for (var r of _(e))
18
+ R.call(e, r) && $(t, r, e[r]);
19
19
  return t;
20
20
  };
21
21
  import A from "vue";
@@ -28,28 +28,28 @@ function m() {
28
28
  return t;
29
29
  }, m.apply(this, arguments);
30
30
  }
31
- var S = ["attrs", "props", "domProps"], B = ["class", "style", "directives"], k = ["on", "nativeOn"], D = function(t) {
31
+ var S = ["attrs", "props", "domProps"], B = ["class", "style", "directives"], b = ["on", "nativeOn"], k = function(t) {
32
32
  return t.reduce(function(e, r) {
33
33
  for (var s in r) if (!e[s]) e[s] = r[s];
34
34
  else if (S.indexOf(s) !== -1) e[s] = m({}, e[s], r[s]);
35
35
  else if (B.indexOf(s) !== -1) {
36
- var n = e[s] instanceof Array ? e[s] : [e[s]], i = r[s] instanceof Array ? r[s] : [r[s]];
37
- e[s] = [].concat(n, i);
38
- } else if (k.indexOf(s) !== -1)
36
+ var i = e[s] instanceof Array ? e[s] : [e[s]], n = r[s] instanceof Array ? r[s] : [r[s]];
37
+ e[s] = [].concat(i, n);
38
+ } else if (b.indexOf(s) !== -1)
39
39
  for (var o in r[s]) if (e[s][o]) {
40
40
  var l = e[s][o] instanceof Array ? e[s][o] : [e[s][o]], f = r[s][o] instanceof Array ? r[s][o] : [r[s][o]];
41
41
  e[s][o] = [].concat(l, f);
42
42
  } else e[s][o] = r[s][o];
43
- else if (s === "hook") for (var u in r[s]) e[s][u] = e[s][u] ? E(e[s][u], r[s][u]) : r[s][u];
43
+ else if (s === "hook") for (var c in r[s]) e[s][c] = e[s][c] ? D(e[s][c], r[s][c]) : r[s][c];
44
44
  else e[s] = r[s];
45
45
  return e;
46
46
  }, {});
47
- }, E = function(t, e) {
47
+ }, D = function(t, e) {
48
48
  return function() {
49
49
  t && t.apply(this, arguments), e && e.apply(this, arguments);
50
50
  };
51
- }, I = D;
52
- const b = /* @__PURE__ */ V(I), a = {
51
+ }, E = k;
52
+ const I = /* @__PURE__ */ V(E), u = {
53
53
  type(t, e) {
54
54
  return Object.prototype.toString.call(t) === "[object " + e + "]";
55
55
  },
@@ -57,7 +57,7 @@ const b = /* @__PURE__ */ V(I), a = {
57
57
  return t == null;
58
58
  },
59
59
  Element(t) {
60
- return typeof t == "object" && t !== null && t.nodeType === 1 && !a.Object(t);
60
+ return typeof t == "object" && t !== null && t.nodeType === 1 && !u.Object(t);
61
61
  },
62
62
  trueArray(t) {
63
63
  return Array.isArray(t) && t.length > 0;
@@ -75,11 +75,11 @@ const b = /* @__PURE__ */ V(I), a = {
75
75
  }
76
76
  };
77
77
  ["Date", "Object", "String", "Boolean", "Array", "Number"].forEach((t) => {
78
- a[t] = function(e) {
79
- return a.type(e, t);
78
+ u[t] = function(e) {
79
+ return u.type(e, t);
80
80
  };
81
81
  });
82
- function w(t, e) {
82
+ function P(t, e) {
83
83
  return {}.hasOwnProperty.call(t, e);
84
84
  }
85
85
  function h(t, e, r) {
@@ -87,38 +87,44 @@ function h(t, e, r) {
87
87
  }
88
88
  function y(t, e = {}, r) {
89
89
  let s = !1;
90
- for (let n in e)
91
- if (Object.prototype.hasOwnProperty.call(e, n)) {
92
- let i = e[n];
93
- if ((s = Array.isArray(i)) || a.Object(i)) {
94
- let o = t[n] === void 0;
90
+ for (let i in e)
91
+ if (Object.prototype.hasOwnProperty.call(e, i)) {
92
+ let n = e[i];
93
+ if ((s = Array.isArray(n)) || u.Object(n)) {
94
+ let o = t[i] === void 0;
95
95
  if (s)
96
- s = !1, o && h(t, n, []);
97
- else if (i._clone && r !== void 0) {
98
- h(t, n, i._clone());
96
+ s = !1, o && h(t, i, []);
97
+ else if (n._clone && r !== void 0) {
98
+ h(t, i, n._clone());
99
99
  continue;
100
100
  } else
101
- o && h(t, n, {});
102
- t[n] = y(t[n], i, r);
101
+ o && h(t, i, {});
102
+ t[i] = y(t[i], n, r);
103
103
  } else
104
- h(t, n, i), a.Undef(i) || (a.Undef(i.__json) || (t[n].__json = i.__json), a.Undef(i.__origin) || (t[n].__origin = i.__origin));
104
+ h(t, i, n), u.Undef(n) || (u.Undef(n.__json) || (t[i].__json = n.__json), u.Undef(n.__origin) || (t[i].__origin = n.__origin));
105
105
  }
106
106
  return t;
107
107
  }
108
108
  function p(t) {
109
109
  return y({}, { value: t }).value;
110
110
  }
111
- const x = Object.assign || function(t) {
111
+ const w = Object.assign || function(t) {
112
112
  for (let e, r = 1; r < arguments.length; r++)
113
113
  for (let s in e = arguments[r], e)
114
114
  Object.prototype.hasOwnProperty.call(e, s) && h(t, s, e[s]);
115
115
  return t;
116
116
  };
117
- function F() {
118
- return x.apply(this, arguments);
117
+ function x() {
118
+ return w.apply(this, arguments);
119
119
  }
120
- const P = "fcGroup", M = {
121
- name: P,
120
+ function F(t) {
121
+ return t && typeof t == "object" && typeof t.then == "function";
122
+ }
123
+ function N(t) {
124
+ return F(t) ? t : Promise.resolve(t);
125
+ }
126
+ const T = "fcGroup", C = {
127
+ name: T,
122
128
  props: {
123
129
  field: String,
124
130
  rule: [Array, Object],
@@ -196,15 +202,15 @@ const P = "fcGroup", M = {
196
202
  Object.keys(this.cacheRule).forEach((r) => {
197
203
  const s = this.cacheRule[r];
198
204
  if (s.$f) {
199
- const n = s.$f.formData();
205
+ const i = s.$f.formData();
200
206
  if (t === e)
201
207
  s.$f.deferSyncValue(() => {
202
- y(s.rule, t), s.$f.setValue(n);
208
+ y(s.rule, t), s.$f.setValue(i);
203
209
  }, !0);
204
210
  else {
205
- const i = s.$f.formData();
211
+ const n = s.$f.formData();
206
212
  s.$f.once("reloading", () => {
207
- s.$f.setValue(i);
213
+ s.$f.setValue(n);
208
214
  }), s.rule = p(t);
209
215
  }
210
216
  }
@@ -218,20 +224,20 @@ const P = "fcGroup", M = {
218
224
  },
219
225
  value(t, e) {
220
226
  t = t || [];
221
- let r = this.sort, s = r.length, n = s - t.length;
222
- if (n < 0) {
223
- for (let i = n; i < 0; i++)
224
- this.addRule(t.length + i);
227
+ let r = this.sort, s = r.length, i = s - t.length;
228
+ if (i < 0) {
229
+ for (let n = i; n < 0; n++)
230
+ this.addRule(t.length + n);
225
231
  this.sort = Object.keys(this.cacheRule);
226
- for (let i = 0; i < s; i++)
227
- this.setValue(r[i], t[i]);
232
+ for (let n = 0; n < s; n++)
233
+ this.setValue(r[n], t[n]);
228
234
  } else {
229
- if (n > 0) {
230
- for (let i = 0; i < n; i++)
231
- this.removeRule(r[s - i - 1]);
235
+ if (i > 0) {
236
+ for (let n = 0; n < i; n++)
237
+ this.removeRule(r[s - n - 1]);
232
238
  this.sort = Object.keys(this.cacheRule);
233
239
  }
234
- t.forEach((i, o) => {
240
+ t.forEach((n, o) => {
235
241
  this.setValue(r[o], t[o]);
236
242
  });
237
243
  }
@@ -239,7 +245,7 @@ const P = "fcGroup", M = {
239
245
  },
240
246
  methods: {
241
247
  _value(t) {
242
- return t && w(t, this.field) ? t[this.field] : t;
248
+ return t && P(t, this.field) ? t[this.field] : t;
243
249
  },
244
250
  cache(t, e) {
245
251
  this.cacheValue[t] = JSON.stringify(e);
@@ -249,13 +255,13 @@ const P = "fcGroup", M = {
249
255
  },
250
256
  formData(t, e) {
251
257
  const r = this.cacheRule, s = this.sort;
252
- if (s.filter((i) => r[i].$f).length !== s.length)
258
+ if (s.filter((n) => r[n].$f).length !== s.length)
253
259
  return;
254
- const n = s.map((i) => {
255
- const o = t === i ? e : d({}, this.cacheRule[i].$f.form), l = this.field ? o[this.field] || null : o;
256
- return this.cache(i, l), l;
260
+ const i = s.map((n) => {
261
+ const o = t === n ? e : d({}, this.cacheRule[n].$f.form), l = this.field ? u.Undef(o[this.field]) ? null : o[this.field] : o;
262
+ return this.cache(n, l), l;
257
263
  });
258
- this.input(n);
264
+ this.input(i);
259
265
  },
260
266
  setValue(t, e) {
261
267
  const r = this.field, s = this.cacheRule[t].$f;
@@ -270,10 +276,10 @@ const P = "fcGroup", M = {
270
276
  };
271
277
  if (this.defaultValue) {
272
278
  s.formData || (s.formData = {});
273
- const n = p(this.defaultValue);
274
- F(s.formData, this.field ? {
275
- [this.field]: n
276
- } : n);
279
+ const i = p(this.defaultValue);
280
+ x(s.formData, this.field ? {
281
+ [this.field]: i
282
+ } : i);
277
283
  }
278
284
  this.parse && this.parse({
279
285
  rule: r,
@@ -300,11 +306,16 @@ const P = "fcGroup", M = {
300
306
  e.push(this.defaultValue ? p(this.defaultValue) : this.field ? null : {}), this.input(e);
301
307
  },
302
308
  del(t, e) {
303
- if (this.disabled || this.onBeforeRemove(this.value, t) === !1)
309
+ if (this.disabled)
304
310
  return;
305
- this.removeRule(e, !0);
306
- const r = [...this.value];
307
- r.splice(t, 1), this.input(r);
311
+ const r = () => {
312
+ this.removeRule(e, !0);
313
+ const s = [...this.value];
314
+ s.splice(t, 1), this.input(s);
315
+ };
316
+ N(this.onBeforeRemove(this.modelValue, t)).then((s) => {
317
+ s !== !1 && r();
318
+ });
308
319
  },
309
320
  addIcon(t) {
310
321
  const e = this.$createElement;
@@ -375,7 +386,7 @@ const P = "fcGroup", M = {
375
386
  this.addRule(e);
376
387
  },
377
388
  render() {
378
- const t = arguments[0], e = this.sort, r = this.button, s = this.type, n = this.disabled, i = e.length === 0 ? this.$scopedSlots.default ? this.$scopedSlots.default({
389
+ const t = arguments[0], e = this.sort, r = this.button, s = this.type, i = this.disabled, n = e.length === 0 ? this.$scopedSlots.default ? this.$scopedSlots.default({
379
390
  vm: this,
380
391
  add: this.add
381
392
  }) : t("div", {
@@ -387,28 +398,28 @@ const P = "fcGroup", M = {
387
398
  }) : e.map((o, l) => {
388
399
  const {
389
400
  rule: f,
390
- options: u
391
- } = this.cacheRule[o], g = r && !n ? this.makeIcon(e.length, l, o) : [];
401
+ options: c
402
+ } = this.cacheRule[o], g = r && !i ? this.makeIcon(e.length, l, o) : [];
392
403
  return t("div", {
393
404
  class: "_fc-group-container",
394
405
  key: o
395
- }, [t(s, b([{
406
+ }, [t(s, I([{
396
407
  key: o
397
408
  }, {
398
409
  on: {
399
- "update:value": (c) => this.formData(o, c),
400
- "emit-event": (c, ...$) => this.emitEvent(c, $, l, o),
401
- input: (c) => this.add$f(l, o, c)
410
+ "update:value": (a) => this.formData(o, a),
411
+ "emit-event": (a, ...v) => this.emitEvent(a, v, l, o),
412
+ input: (a) => this.add$f(l, o, a)
402
413
  }
403
414
  }, {}, {
404
415
  props: {
405
- disabled: n,
416
+ disabled: i,
406
417
  inFor: !0,
407
418
  value: this.field ? {
408
419
  [this.field]: this._value(this.value[l])
409
420
  } : this.value[l],
410
421
  rule: f,
411
- option: u,
422
+ option: c,
412
423
  extendOption: !0
413
424
  }
414
425
  }])), t("div", {
@@ -419,10 +430,10 @@ const P = "fcGroup", M = {
419
430
  });
420
431
  return t("div", {
421
432
  key: "con",
422
- class: "_fc-group " + (n ? "_fc-group-disabled" : "")
423
- }, [i]);
433
+ class: "_fc-group " + (i ? "_fc-group-disabled" : "")
434
+ }, [n]);
424
435
  }
425
436
  };
426
437
  export {
427
- M as default
438
+ C as default
428
439
  };
package/dist/index.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /*!
2
2
  * FormCreate 低代码表单渲染器
3
- * @form-create/component-elm-group v2.7.8
4
- * (c) 2018-2025 xaboy
3
+ * @form-create/component-elm-group v2.7.27
4
+ * (c) 2018-2026 xaboy
5
5
  * Github https://github.com/xaboy/form-create
6
6
  * Site https://form-create.com/
7
7
  * Released under the MIT License.
8
8
  */
9
9
  (function(){"use strict";try{if(typeof document!="undefined"){var o=document.createElement("style");o.appendChild(document.createTextNode('._fc-group{display:flex;min-height:42px;justify-content:center;flex-direction:column}._fc-group-disabled ._fc-group-btn,._fc-group-disabled ._fc-group-add{cursor:not-allowed}._fc-group-handle{display:flex;flex-direction:row;position:absolute;bottom:-15px;right:30px;border-radius:15px;border:1px dashed #d9d9d9;padding:3px 8px;background-color:#fff}._fc-group-btn{cursor:pointer}._fc-group-idx{position:absolute;bottom:-15px;left:10px;width:30px;height:30px;display:flex;align-items:center;justify-content:center;background:#eee;border-radius:15px;font-weight:700}._fc-group-handle ._fc-group-btn+._fc-group-btn{margin-left:7px}._fc-group-container{position:relative;display:flex;flex-direction:column;border:1px dashed #d9d9d9;padding:20px 20px 25px;margin:5px 5px 25px;border-radius:5px}._fc-group-arrow{position:relative;width:20px;height:20px}._fc-group-arrow:before{content:"";position:absolute;top:8px;left:5px;width:9px;height:9px;border-left:2px solid #999;border-top:2px solid #999}._fc-group-arrow:before{transform:rotate(45deg)}._fc-group-arrow._fc-group-down{transform:rotate(180deg)}._fc-group-plus-minus{width:20px;height:20px;position:relative;cursor:pointer}._fc-group-plus-minus:before,._fc-group-plus-minus:after{content:"";position:absolute;top:50%;left:50%;width:60%;height:2px;background-color:#409eff;transform:translate(-50%,-50%)}._fc-group-plus-minus:before{transform:translate(-50%,-50%) rotate(90deg)}._fc-group-plus-minus._fc-group-minus:before{display:none}._fc-group-plus-minus._fc-group-minus:after{background-color:#f56c6c}._fc-group-add{cursor:pointer;width:25px;height:25px;border:1px solid rgb(64 158 255 / 50%);border-radius:15px}._fc-group-add._fc-group-plus-minus:before,._fc-group-add._fc-group-plus-minus:after{width:50%}')),document.head.appendChild(o)}}catch(r){console.error("vite-plugin-css-injected-by-js",r)}})();
10
- (function(l,u){typeof exports=="object"&&typeof module!="undefined"?module.exports=u(require("vue")):typeof define=="function"&&define.amd?define(["vue"],u):(l=typeof globalThis!="undefined"?globalThis:l||self,l.FcGroup=u(l.Vue))})(this,function(l){"use strict";var w=Object.defineProperty;var $=Object.getOwnPropertySymbols;var x=Object.prototype.hasOwnProperty,F=Object.prototype.propertyIsEnumerable;var O=(l,u,c)=>u in l?w(l,u,{enumerable:!0,configurable:!0,writable:!0,value:c}):l[u]=c,v=(l,u)=>{for(var c in u||(u={}))x.call(u,c)&&O(l,c,u[c]);if($)for(var c of $(u))F.call(u,c)&&O(l,c,u[c]);return l};function u(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function c(){return c=Object.assign?Object.assign.bind():function(e){for(var t,r=1;r<arguments.length;r++)for(var s in t=arguments[r],t)Object.prototype.hasOwnProperty.call(t,s)&&(e[s]=t[s]);return e},c.apply(this,arguments)}var j=["attrs","props","domProps"],R=["class","style","directives"],A=["on","nativeOn"],V=function(e){return e.reduce(function(t,r){for(var s in r)if(!t[s])t[s]=r[s];else if(j.indexOf(s)!==-1)t[s]=c({},t[s],r[s]);else if(R.indexOf(s)!==-1){var i=t[s]instanceof Array?t[s]:[t[s]],n=r[s]instanceof Array?r[s]:[r[s]];t[s]=[].concat(i,n)}else if(A.indexOf(s)!==-1)for(var o in r[s])if(t[s][o]){var a=t[s][o]instanceof Array?t[s][o]:[t[s][o]],g=r[s][o]instanceof Array?r[s][o]:[r[s][o]];t[s][o]=[].concat(a,g)}else t[s][o]=r[s][o];else if(s==="hook")for(var f in r[s])t[s][f]=t[s][f]?S(t[s][f],r[s][f]):r[s][f];else t[s]=r[s];return t},{})},S=function(e,t){return function(){e&&e.apply(this,arguments),t&&t.apply(this,arguments)}},B=V;const E=u(B),h={type(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"},Undef(e){return e==null},Element(e){return typeof e=="object"&&e!==null&&e.nodeType===1&&!h.Object(e)},trueArray(e){return Array.isArray(e)&&e.length>0},Function(e){const t=this.getType(e);return t==="Function"||t==="AsyncFunction"},getType(e){const t=Object.prototype.toString.call(e);return/^\[object (.*)\]$/.exec(t)[1]},empty(e){return e==null||Array.isArray(e)&&Array.isArray(e)&&!e.length?!0:typeof e=="string"&&!e}};["Date","Object","String","Boolean","Array","Number"].forEach(e=>{h[e]=function(t){return h.type(t,e)}});function k(e,t){return{}.hasOwnProperty.call(e,t)}function d(e,t,r){l.set(e,t,r)}function m(e,t={},r){let s=!1;for(let i in t)if(Object.prototype.hasOwnProperty.call(t,i)){let n=t[i];if((s=Array.isArray(n))||h.Object(n)){let o=e[i]===void 0;if(s)s=!1,o&&d(e,i,[]);else if(n._clone&&r!==void 0){d(e,i,n._clone());continue}else o&&d(e,i,{});e[i]=m(e[i],n,r)}else d(e,i,n),h.Undef(n)||(h.Undef(n.__json)||(e[i].__json=n.__json),h.Undef(n.__origin)||(e[i].__origin=n.__origin))}return e}function y(e){return m({},{value:e}).value}const D=Object.assign||function(e){for(let t,r=1;r<arguments.length;r++)for(let s in t=arguments[r],t)Object.prototype.hasOwnProperty.call(t,s)&&d(e,s,t[s]);return e};function I(){return D.apply(this,arguments)}return{name:"fcGroup",props:{field:String,rule:[Array,Object],rules:Array,expand:Number,options:Object,formCreateInject:{type:Object,required:!0},button:{type:Boolean,default:!0},max:{type:Number,default:0},min:{type:Number,default:0},value:{type:Array,default:()=>[]},sortBtn:{type:Boolean,default:!0},defaultValue:Object,disabled:{type:Boolean,default:!1},syncDisabled:{type:Boolean,default:!0},onBeforeRemove:{type:Function,default:()=>{}},onBeforeAdd:{type:Function,default:()=>{}},parse:Function},data(){return{len:0,cacheRule:{},cacheValue:{},sort:[],type:void 0}},computed:{formRule(){return this.rules?this.rules:this.rule?Array.isArray(this.rule)?this.rule:[this.rule]:[]}},watch:{cacheRule:{handler(e){this.sort=Object.keys(e)},immediate:!0},formRule:{handler(e,t){Object.keys(this.cacheRule).forEach(r=>{const s=this.cacheRule[r];if(s.$f){const i=s.$f.formData();if(e===t)s.$f.deferSyncValue(()=>{m(s.rule,e),s.$f.setValue(i)},!0);else{const n=s.$f.formData();s.$f.once("reloading",()=>{s.$f.setValue(n)}),s.rule=y(e)}}})},deep:!0},expand(e){let t=e-this.value.length;t>0&&this.expandRule(t)},value(e,t){e=e||[];let r=this.sort,s=r.length,i=s-e.length;if(i<0){for(let n=i;n<0;n++)this.addRule(e.length+n);this.sort=Object.keys(this.cacheRule);for(let n=0;n<s;n++)this.setValue(r[n],e[n])}else{if(i>0){for(let n=0;n<i;n++)this.removeRule(r[s-n-1]);this.sort=Object.keys(this.cacheRule)}e.forEach((n,o)=>{this.setValue(r[o],e[o])})}}},methods:{_value(e){return e&&k(e,this.field)?e[this.field]:e},cache(e,t){this.cacheValue[e]=JSON.stringify(t)},input(e){this.$emit("input",e),this.$emit("change",e)},formData(e,t){const r=this.cacheRule,s=this.sort;if(s.filter(n=>r[n].$f).length!==s.length)return;const i=s.map(n=>{const o=e===n?t:v({},this.cacheRule[n].$f.form),a=this.field?o[this.field]||null:o;return this.cache(n,a),a});this.input(i)},setValue(e,t){const r=this.field,s=this.cacheRule[e].$f;r&&(t={[r]:this._value(t)}),this.cacheValue[e]!==JSON.stringify(r?t[r]:t)&&(this.cache(e,t),s&&s.coverValue(t||{}))},addRule(e,t){const r=this.formCreateInject.form.copyRules(this.formRule),s=this.options?v({},this.options):{submitBtn:!1,resetBtn:!1};if(this.defaultValue){s.formData||(s.formData={});const i=y(this.defaultValue);I(s.formData,this.field?{[this.field]:i}:i)}this.parse&&this.parse({rule:r,options:s,index:this.sort.length}),this.$set(this.cacheRule,++this.len,{rule:r,options:s}),t&&this.$nextTick(()=>this.$emit("add",r,Object.keys(this.cacheRule).length-1))},add$f(e,t,r){this.cacheRule[t].$f=r,this.$nextTick(()=>{this.$emit("itemMounted",r,Object.keys(this.cacheRule).indexOf(t))})},removeRule(e,t){const r=Object.keys(this.cacheRule).indexOf(e);this.$delete(this.cacheRule,e),this.$delete(this.cacheValue,e),t&&this.$nextTick(()=>this.$emit("remove",r))},add(e){if(this.disabled||this.onBeforeAdd(this.value)===!1)return;const t=[...this.value];t.push(this.defaultValue?y(this.defaultValue):this.field?null:{}),this.input(t)},del(e,t){if(this.disabled||this.onBeforeRemove(this.value,e)===!1)return;this.removeRule(t,!0);const r=[...this.value];r.splice(e,1),this.input(r)},addIcon(e){const t=this.$createElement;return t("div",{class:"_fc-group-btn _fc-group-plus-minus",on:{click:this.add}})},delIcon(e,t){const r=this.$createElement;return r("div",{class:"_fc-group-btn _fc-group-plus-minus _fc-group-minus",on:{click:()=>this.del(e,t)}})},sortUpIcon(e){const t=this.$createElement;return t("div",{class:"_fc-group-btn _fc-group-arrow _fc-group-up",on:{click:()=>this.changeSort(e,-1)}})},sortDownIcon(e){const t=this.$createElement;return t("div",{class:"_fc-group-btn _fc-group-arrow _fc-group-down",on:{click:()=>this.changeSort(e,1)}})},changeSort(e,t){const r=this.sort[e];this.$set(this.sort,e,this.sort[e+t]),this.sort[e+t]=r,this.formData(0)},makeIcon(e,t,r){if(this.$scopedSlots.button)return this.$scopedSlots.button({total:e,index:t,vm:this,key:r,del:()=>this.del(t,r),add:this.add});const s=[];return(!this.max||e<this.max)&&e===t+1&&s.push(this.addIcon(r)),e>this.min&&s.push(this.delIcon(t,r)),this.sortBtn&&t&&s.push(this.sortUpIcon(t)),this.sortBtn&&t!==e-1&&s.push(this.sortDownIcon(t)),s},emitEvent(e,t,r,s){this.$emit(e,...t,this.cacheRule[s].$f,r)},expandRule(e){for(let t=0;t<e;t++)this.value.push(this.field?null:{})}},created(){this.type=this.formCreateInject.form.$form();const e=(this.expand||0)-this.value.length;e>0&&this.expandRule(e);for(let t=0;t<this.value.length;t++)this.addRule(t)},render(){const e=arguments[0],t=this.sort,r=this.button,s=this.type,i=this.disabled,n=t.length===0?this.$scopedSlots.default?this.$scopedSlots.default({vm:this,add:this.add}):e("div",{key:"a_def",class:"_fc-group-plus-minus _fc-group-add fc-clock",on:{click:this.add}}):t.map((o,a)=>{const{rule:g,options:f}=this.cacheRule[o],_=r&&!i?this.makeIcon(t.length,a,o):[];return e("div",{class:"_fc-group-container",key:o},[e(s,E([{key:o},{on:{"update:value":p=>this.formData(o,p),"emit-event":(p,...b)=>this.emitEvent(p,b,a,o),input:p=>this.add$f(a,o,p)}},{},{props:{disabled:i,inFor:!0,value:this.field?{[this.field]:this._value(this.value[a])}:this.value[a],rule:g,option:f,extendOption:!0}}])),e("div",{class:"_fc-group-idx"},[a+1]),_.length?e("div",{class:"_fc-group-handle fc-clock"},[_]):null])});return e("div",{key:"con",class:"_fc-group "+(i?"_fc-group-disabled":"")},[n])}}});
10
+ (function(l,u){typeof exports=="object"&&typeof module!="undefined"?module.exports=u(require("vue")):typeof define=="function"&&define.amd?define(["vue"],u):(l=typeof globalThis!="undefined"?globalThis:l||self,l.FcGroup=u(l.Vue))})(this,function(l){"use strict";var x=Object.defineProperty;var $=Object.getOwnPropertySymbols;var F=Object.prototype.hasOwnProperty,T=Object.prototype.propertyIsEnumerable;var O=(l,u,c)=>u in l?x(l,u,{enumerable:!0,configurable:!0,writable:!0,value:c}):l[u]=c,_=(l,u)=>{for(var c in u||(u={}))F.call(u,c)&&O(l,c,u[c]);if($)for(var c of $(u))T.call(u,c)&&O(l,c,u[c]);return l};function u(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function c(){return c=Object.assign?Object.assign.bind():function(e){for(var t,r=1;r<arguments.length;r++)for(var s in t=arguments[r],t)Object.prototype.hasOwnProperty.call(t,s)&&(e[s]=t[s]);return e},c.apply(this,arguments)}var j=["attrs","props","domProps"],R=["class","style","directives"],A=["on","nativeOn"],V=function(e){return e.reduce(function(t,r){for(var s in r)if(!t[s])t[s]=r[s];else if(j.indexOf(s)!==-1)t[s]=c({},t[s],r[s]);else if(R.indexOf(s)!==-1){var i=t[s]instanceof Array?t[s]:[t[s]],n=r[s]instanceof Array?r[s]:[r[s]];t[s]=[].concat(i,n)}else if(A.indexOf(s)!==-1)for(var o in r[s])if(t[s][o]){var h=t[s][o]instanceof Array?t[s][o]:[t[s][o]],g=r[s][o]instanceof Array?r[s][o]:[r[s][o]];t[s][o]=[].concat(h,g)}else t[s][o]=r[s][o];else if(s==="hook")for(var f in r[s])t[s][f]=t[s][f]?S(t[s][f],r[s][f]):r[s][f];else t[s]=r[s];return t},{})},S=function(e,t){return function(){e&&e.apply(this,arguments),t&&t.apply(this,arguments)}},B=V;const E=u(B),a={type(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"},Undef(e){return e==null},Element(e){return typeof e=="object"&&e!==null&&e.nodeType===1&&!a.Object(e)},trueArray(e){return Array.isArray(e)&&e.length>0},Function(e){const t=this.getType(e);return t==="Function"||t==="AsyncFunction"},getType(e){const t=Object.prototype.toString.call(e);return/^\[object (.*)\]$/.exec(t)[1]},empty(e){return e==null||Array.isArray(e)&&Array.isArray(e)&&!e.length?!0:typeof e=="string"&&!e}};["Date","Object","String","Boolean","Array","Number"].forEach(e=>{a[e]=function(t){return a.type(t,e)}});function b(e,t){return{}.hasOwnProperty.call(e,t)}function d(e,t,r){l.set(e,t,r)}function m(e,t={},r){let s=!1;for(let i in t)if(Object.prototype.hasOwnProperty.call(t,i)){let n=t[i];if((s=Array.isArray(n))||a.Object(n)){let o=e[i]===void 0;if(s)s=!1,o&&d(e,i,[]);else if(n._clone&&r!==void 0){d(e,i,n._clone());continue}else o&&d(e,i,{});e[i]=m(e[i],n,r)}else d(e,i,n),a.Undef(n)||(a.Undef(n.__json)||(e[i].__json=n.__json),a.Undef(n.__origin)||(e[i].__origin=n.__origin))}return e}function y(e){return m({},{value:e}).value}const k=Object.assign||function(e){for(let t,r=1;r<arguments.length;r++)for(let s in t=arguments[r],t)Object.prototype.hasOwnProperty.call(t,s)&&d(e,s,t[s]);return e};function D(){return k.apply(this,arguments)}function I(e){return e&&typeof e=="object"&&typeof e.then=="function"}function P(e){return I(e)?e:Promise.resolve(e)}return{name:"fcGroup",props:{field:String,rule:[Array,Object],rules:Array,expand:Number,options:Object,formCreateInject:{type:Object,required:!0},button:{type:Boolean,default:!0},max:{type:Number,default:0},min:{type:Number,default:0},value:{type:Array,default:()=>[]},sortBtn:{type:Boolean,default:!0},defaultValue:Object,disabled:{type:Boolean,default:!1},syncDisabled:{type:Boolean,default:!0},onBeforeRemove:{type:Function,default:()=>{}},onBeforeAdd:{type:Function,default:()=>{}},parse:Function},data(){return{len:0,cacheRule:{},cacheValue:{},sort:[],type:void 0}},computed:{formRule(){return this.rules?this.rules:this.rule?Array.isArray(this.rule)?this.rule:[this.rule]:[]}},watch:{cacheRule:{handler(e){this.sort=Object.keys(e)},immediate:!0},formRule:{handler(e,t){Object.keys(this.cacheRule).forEach(r=>{const s=this.cacheRule[r];if(s.$f){const i=s.$f.formData();if(e===t)s.$f.deferSyncValue(()=>{m(s.rule,e),s.$f.setValue(i)},!0);else{const n=s.$f.formData();s.$f.once("reloading",()=>{s.$f.setValue(n)}),s.rule=y(e)}}})},deep:!0},expand(e){let t=e-this.value.length;t>0&&this.expandRule(t)},value(e,t){e=e||[];let r=this.sort,s=r.length,i=s-e.length;if(i<0){for(let n=i;n<0;n++)this.addRule(e.length+n);this.sort=Object.keys(this.cacheRule);for(let n=0;n<s;n++)this.setValue(r[n],e[n])}else{if(i>0){for(let n=0;n<i;n++)this.removeRule(r[s-n-1]);this.sort=Object.keys(this.cacheRule)}e.forEach((n,o)=>{this.setValue(r[o],e[o])})}}},methods:{_value(e){return e&&b(e,this.field)?e[this.field]:e},cache(e,t){this.cacheValue[e]=JSON.stringify(t)},input(e){this.$emit("input",e),this.$emit("change",e)},formData(e,t){const r=this.cacheRule,s=this.sort;if(s.filter(n=>r[n].$f).length!==s.length)return;const i=s.map(n=>{const o=e===n?t:_({},this.cacheRule[n].$f.form),h=this.field?a.Undef(o[this.field])?null:o[this.field]:o;return this.cache(n,h),h});this.input(i)},setValue(e,t){const r=this.field,s=this.cacheRule[e].$f;r&&(t={[r]:this._value(t)}),this.cacheValue[e]!==JSON.stringify(r?t[r]:t)&&(this.cache(e,t),s&&s.coverValue(t||{}))},addRule(e,t){const r=this.formCreateInject.form.copyRules(this.formRule),s=this.options?_({},this.options):{submitBtn:!1,resetBtn:!1};if(this.defaultValue){s.formData||(s.formData={});const i=y(this.defaultValue);D(s.formData,this.field?{[this.field]:i}:i)}this.parse&&this.parse({rule:r,options:s,index:this.sort.length}),this.$set(this.cacheRule,++this.len,{rule:r,options:s}),t&&this.$nextTick(()=>this.$emit("add",r,Object.keys(this.cacheRule).length-1))},add$f(e,t,r){this.cacheRule[t].$f=r,this.$nextTick(()=>{this.$emit("itemMounted",r,Object.keys(this.cacheRule).indexOf(t))})},removeRule(e,t){const r=Object.keys(this.cacheRule).indexOf(e);this.$delete(this.cacheRule,e),this.$delete(this.cacheValue,e),t&&this.$nextTick(()=>this.$emit("remove",r))},add(e){if(this.disabled||this.onBeforeAdd(this.value)===!1)return;const t=[...this.value];t.push(this.defaultValue?y(this.defaultValue):this.field?null:{}),this.input(t)},del(e,t){if(this.disabled)return;const r=()=>{this.removeRule(t,!0);const s=[...this.value];s.splice(e,1),this.input(s)};P(this.onBeforeRemove(this.modelValue,e)).then(s=>{s!==!1&&r()})},addIcon(e){const t=this.$createElement;return t("div",{class:"_fc-group-btn _fc-group-plus-minus",on:{click:this.add}})},delIcon(e,t){const r=this.$createElement;return r("div",{class:"_fc-group-btn _fc-group-plus-minus _fc-group-minus",on:{click:()=>this.del(e,t)}})},sortUpIcon(e){const t=this.$createElement;return t("div",{class:"_fc-group-btn _fc-group-arrow _fc-group-up",on:{click:()=>this.changeSort(e,-1)}})},sortDownIcon(e){const t=this.$createElement;return t("div",{class:"_fc-group-btn _fc-group-arrow _fc-group-down",on:{click:()=>this.changeSort(e,1)}})},changeSort(e,t){const r=this.sort[e];this.$set(this.sort,e,this.sort[e+t]),this.sort[e+t]=r,this.formData(0)},makeIcon(e,t,r){if(this.$scopedSlots.button)return this.$scopedSlots.button({total:e,index:t,vm:this,key:r,del:()=>this.del(t,r),add:this.add});const s=[];return(!this.max||e<this.max)&&e===t+1&&s.push(this.addIcon(r)),e>this.min&&s.push(this.delIcon(t,r)),this.sortBtn&&t&&s.push(this.sortUpIcon(t)),this.sortBtn&&t!==e-1&&s.push(this.sortDownIcon(t)),s},emitEvent(e,t,r,s){this.$emit(e,...t,this.cacheRule[s].$f,r)},expandRule(e){for(let t=0;t<e;t++)this.value.push(this.field?null:{})}},created(){this.type=this.formCreateInject.form.$form();const e=(this.expand||0)-this.value.length;e>0&&this.expandRule(e);for(let t=0;t<this.value.length;t++)this.addRule(t)},render(){const e=arguments[0],t=this.sort,r=this.button,s=this.type,i=this.disabled,n=t.length===0?this.$scopedSlots.default?this.$scopedSlots.default({vm:this,add:this.add}):e("div",{key:"a_def",class:"_fc-group-plus-minus _fc-group-add fc-clock",on:{click:this.add}}):t.map((o,h)=>{const{rule:g,options:f}=this.cacheRule[o],v=r&&!i?this.makeIcon(t.length,h,o):[];return e("div",{class:"_fc-group-container",key:o},[e(s,E([{key:o},{on:{"update:value":p=>this.formData(o,p),"emit-event":(p,...w)=>this.emitEvent(p,w,h,o),input:p=>this.add$f(h,o,p)}},{},{props:{disabled:i,inFor:!0,value:this.field?{[this.field]:this._value(this.value[h])}:this.value[h],rule:g,option:f,extendOption:!0}}])),e("div",{class:"_fc-group-idx"},[h+1]),v.length?e("div",{class:"_fc-group-handle fc-clock"},[v]):null])});return e("div",{key:"con",class:"_fc-group "+(i?"_fc-group-disabled":"")},[n])}}});
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@form-create/component-elm-group",
3
- "version": "2.7.8",
3
+ "version": "2.7.27",
4
4
  "description": "@form-create/element-ui 内置组件",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.es.js",
@@ -30,7 +30,7 @@
30
30
  "author": "xaboy",
31
31
  "license": "MIT",
32
32
  "dependencies": {
33
- "@form-create/utils": "^2.7.8"
33
+ "@form-create/utils": "^2.7.17"
34
34
  },
35
35
  "bugs": {
36
36
  "url": "https://github.com/xaboy/form-create/issues"
@@ -39,5 +39,5 @@
39
39
  "publishConfig": {
40
40
  "access": "public"
41
41
  },
42
- "gitHead": "19d09ed0c648be549597af84643a0b8694a6fb7d"
42
+ "gitHead": "482b4656db7e5bd572541272cd2bdf28f204b65f"
43
43
  }
package/src/component.jsx CHANGED
@@ -1,7 +1,8 @@
1
- import {hasProperty} from '@form-create/utils/lib/type';
1
+ import is, {hasProperty} from '@form-create/utils/lib/type';
2
2
  import deepExtend, {deepCopy} from '@form-create/utils/lib/deepextend';
3
3
  import extend from '@form-create/utils/lib/extend';
4
4
  import './style.css';
5
+ import {toPromise} from '@form-create/utils';
5
6
 
6
7
  const NAME = 'fcGroup';
7
8
 
@@ -157,7 +158,7 @@ export default {
157
158
  }
158
159
  const value = keys.map(k => {
159
160
  const data = key === k ? formData : {...this.cacheRule[k].$f.form};
160
- const value = this.field ? data[this.field] || null : data;
161
+ const value = this.field ? (is.Undef(data[this.field]) ? null : data[this.field]) : data;
161
162
  this.cache(k, value);
162
163
  return value;
163
164
  });
@@ -214,13 +215,20 @@ export default {
214
215
  this.input(value);
215
216
  },
216
217
  del(index, key) {
217
- if (this.disabled || false === this.onBeforeRemove(this.value, index)) {
218
+ if (this.disabled) {
218
219
  return;
219
220
  }
220
- this.removeRule(key, true);
221
- const value = [...this.value];
222
- value.splice(index, 1);
223
- this.input(value);
221
+ const del = () => {
222
+ this.removeRule(key, true);
223
+ const value = [...this.value];
224
+ value.splice(index, 1);
225
+ this.input(value);
226
+ }
227
+ toPromise(this.onBeforeRemove(this.modelValue, index)).then(res => {
228
+ if (false !== res) {
229
+ del();
230
+ }
231
+ })
224
232
  },
225
233
  addIcon(key) {
226
234
  return <div class="_fc-group-btn _fc-group-plus-minus" on-click={this.add}></div>;