@form-create/component-elm-group 3.1.1 → 3.1.4

package/dist/index.esm.js

@@ -1,10 +1,10 @@
 /*!
- * @form-create/component-elm-group v3.1.0
+ * @form-create/component-elm-group v3.1.4
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create with group
  * Released under the MIT License.
  */
-import { defineComponent, markRaw, nextTick, createVNode, resolveComponent, isVNode } from 'vue';
+import { openBlock, createElementBlock, createElementVNode, defineComponent, markRaw, nextTick, createVNode, resolveComponent, isVNode } from 'vue';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -120,9 +120,28 @@ var is = {
   },
   trueArray: function trueArray(data) {
     return Array.isArray(data) && data.length > 0;
+  },
+  Function: function Function(v) {
+    var type = this.getType(v);
+    return type === 'Function' || type === 'AsyncFunction';
+  },
+  getType: function getType(v) {
+    var str = Object.prototype.toString.call(v);
+    return /^\[object (.*)\]$/.exec(str)[1];
+  },
+  empty: function empty(value) {
+    if (value === undefined || value === null) {
+      return true;
+    }
+
+    if (Array.isArray(value) && Array.isArray(value) && !value.length) {
+      return true;
+    }
+
+    return typeof value === 'string' && !value;
   }
 };
-['Date', 'Object', 'Function', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
+['Date', 'Object', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
   is[t] = function (arg) {
     return is.type(arg, t);
   };
@@ -131,6 +150,137 @@ function hasProperty(rule, k) {
   return {}.hasOwnProperty.call(rule, k);
 }
 
+var script$1 = {
+  name: 'IconCirclePlus'
+};
+
+var _hoisted_1$1 = {
+  "class": "icon",
+  viewBox: "0 0 1024 1024",
+  xmlns: "http://www.w3.org/2000/svg"
+};
+
+var _hoisted_2$1 = /*#__PURE__*/createElementVNode("path", {
+  fill: "currentColor",
+  d: "M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"
+}, null, -1);
+
+var _hoisted_3$1 = /*#__PURE__*/createElementVNode("path", {
+  fill: "currentColor",
+  d: "M480 672V352a32 32 0 1164 0v320a32 32 0 01-64 0z"
+}, null, -1);
+
+var _hoisted_4$1 = /*#__PURE__*/createElementVNode("path", {
+  fill: "currentColor",
+  d: "M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"
+}, null, -1);
+
+var _hoisted_5 = [_hoisted_2$1, _hoisted_3$1, _hoisted_4$1];
+function render$1(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("svg", _hoisted_1$1, _hoisted_5);
+}
+
+script$1.render = render$1;
+
+var script = {
+  name: 'IconRemove'
+};
+
+var _hoisted_1 = {
+  "class": "icon",
+  viewBox: "0 0 1024 1024",
+  xmlns: "http://www.w3.org/2000/svg"
+};
+
+var _hoisted_2 = /*#__PURE__*/createElementVNode("path", {
+  fill: "currentColor",
+  d: "M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"
+}, null, -1);
+
+var _hoisted_3 = /*#__PURE__*/createElementVNode("path", {
+  fill: "currentColor",
+  d: "M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"
+}, null, -1);
+
+var _hoisted_4 = [_hoisted_2, _hoisted_3];
+function render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("svg", _hoisted_1, _hoisted_4);
+}
+
+script.render = render;
+
+function $set(target, field, value) {
+  target[field] = value;
+}
+
+function deepExtend(origin) {
+  var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var mode = arguments.length > 2 ? arguments[2] : undefined;
+  var isArr = false;
+
+  for (var key in target) {
+    if (Object.prototype.hasOwnProperty.call(target, key)) {
+      var clone = target[key];
+
+      if ((isArr = Array.isArray(clone)) || is.Object(clone)) {
+        var nst = origin[key] === undefined;
+
+        if (isArr) {
+          isArr = false;
+          nst && $set(origin, key, []);
+        } else if (clone._clone && mode !== undefined) {
+          if (mode) {
+            clone = clone.getRule();
+            nst && $set(origin, key, {});
+          } else {
+            $set(origin, key, clone._clone());
+            continue;
+          }
+        } else {
+          nst && $set(origin, key, {});
+        }
+
+        origin[key] = deepExtend(origin[key], clone, mode);
+      } else {
+        $set(origin, key, clone);
+
+        if (!is.Undef(clone)) {
+          if (!is.Undef(clone.__json)) {
+            origin[key].__json = clone.__json;
+          }
+
+          if (!is.Undef(clone.__origin)) {
+            origin[key].__origin = clone.__origin;
+          }
+        }
+      }
+    }
+  }
+
+  return mode !== undefined && Array.isArray(origin) ? origin.filter(function (v) {
+    return !v || !v.__ctrl;
+  }) : origin;
+}
+function deepCopy(value) {
+  return deepExtend({}, {
+    value: value
+  }).value;
+}
+
+var _extends = Object.assign || function (a) {
+  for (var b, c = 1; c < arguments.length; c++) {
+    for (var d in b = arguments[c], b) {
+      Object.prototype.hasOwnProperty.call(b, d) && $set(a, d, b[d]);
+    }
+  }
+
+  return a;
+};
+
+function extend() {
+  return _extends.apply(this, arguments);
+}
+
 function _isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !isVNode(s);
 }
@@ -161,6 +311,7 @@ var Group = defineComponent({
         return [];
       }
     },
+    defaultValue: Object,
     disabled: {
       type: Boolean,
       "default": false
@@ -230,8 +381,6 @@ var Group = defineComponent({
             for (var _i2 = 0; _i2 < len; _i2++) {
               this.removeRule(keys[total - _i2 - 1]);
             }
-
-            this.subForm();
           }
 
           n.forEach(function (val, i) {
@@ -239,8 +388,7 @@ var Group = defineComponent({
           });
         }
       },
-      deep: true,
-      flush: 'post'
+      deep: true
     }
   },
   methods: {
@@ -297,6 +445,13 @@ var Group = defineComponent({
         submitBtn: false,
         resetBtn: false
       };
+
+      if (this.defaultValue) {
+        if (!options.formData) options.formData = {};
+        var defVal = deepCopy(this.defaultValue);
+        extend(options.formData, this.field ? _defineProperty({}, this.field, defVal) : defVal);
+      }
+
       this.cacheRule[++this.len] = {
         rule: rule,
         options: options
@@ -312,7 +467,7 @@ var Group = defineComponent({
       var _this4 = this;
 
       this.cacheRule[key].$f = $f;
-      this.subForm();
+      this.formData(key, $f.formData());
       nextTick(function () {
         if (_this4.syncDisabled) {
           $f.disabled(_this4.disabled);
@@ -321,15 +476,8 @@ var Group = defineComponent({
         _this4.$emit('itemMounted', $f, Object.keys(_this4.cacheRule).indexOf(key));
       });
     },
-    subForm: function subForm() {
-      var _this5 = this;
-
-      this.formCreateInject.subForm(Object.keys(this.cacheRule).map(function (k) {
-        return _this5.cacheRule[k].$f;
-      }));
-    },
     removeRule: function removeRule(key, emit) {
-      var _this6 = this;
+      var _this5 = this;
 
       var index = Object.keys(this.cacheRule).indexOf(key);
       delete this.cacheRule[key];
@@ -337,7 +485,7 @@ var Group = defineComponent({
 
       if (emit) {
         nextTick(function () {
-          return _this6.$emit('remove', index);
+          return _this5.$emit('remove', index);
         });
       }
     },
@@ -355,39 +503,38 @@ var Group = defineComponent({
       }
 
       this.removeRule(key, true);
-      this.subForm();
       this.modelValue.splice(index, 1);
       this.input(this.modelValue);
     },
     addIcon: function addIcon(key) {
-      return createVNode(resolveComponent("el-icon"), {
+      return createVNode(resolveComponent("ElIcon"), {
         "key": "a".concat(key),
         "style": "font-size:".concat(this.fontSize, "px;cursor:").concat(this.disabled ? 'not-allowed;color:#c9cdd4' : 'pointer', ";"),
         "onClick": this.add
       }, {
         "default": function _default() {
-          return [createVNode(resolveComponent("circle-plus"), null, null)];
+          return [createVNode(script$1, null, null)];
         }
       });
     },
     delIcon: function delIcon(index, key) {
-      var _this7 = this;
+      var _this6 = this;
 
       return createVNode(resolveComponent("ElIcon"), {
         "key": "d".concat(key),
         "class": "el-icon-remove-outline",
         "style": "font-size:".concat(this.fontSize, "px;cursor:").concat(this.disabled ? 'not-allowed;color:#c9cdd4' : 'pointer;color:#606266', ";"),
         "onClick": function onClick() {
-          return _this7.del(index, key);
+          return _this6.del(index, key);
         }
       }, {
         "default": function _default() {
-          return [createVNode(resolveComponent("remove"), null, null)];
+          return [createVNode(script, null, null)];
         }
       });
     },
     makeIcon: function makeIcon(total, index, key) {
-      var _this8 = this;
+      var _this7 = this;
 
       if (this.$slots.button) {
         return this.$slots.button({
@@ -396,7 +543,7 @@ var Group = defineComponent({
           vm: this,
           key: key,
           del: function del() {
-            return _this8.del(index, key);
+            return _this7.del(index, key);
           },
           add: this.add
         });
@@ -431,7 +578,7 @@ var Group = defineComponent({
     }
   },
   render: function render() {
-    var _this9 = this;
+    var _this8 = this;
 
     var keys = Object.keys(this.cacheRule);
     var button = this.button;
@@ -439,19 +586,22 @@ var Group = defineComponent({
     return keys.length === 0 ? this.$slots["default"] ? this.$slots["default"]({
       vm: this,
       add: this.add
-    }) : createVNode("i", {
+    }) : createVNode(resolveComponent("ElIcon"), {
       "key": 1,
-      "class": "el-icon-circle-plus-outline",
       "style": "font-size:".concat(this.fontSize, "px;vertical-align:middle;color:").concat(this.disabled ? '#c9cdd4;cursor: not-allowed' : '#606266;cursor:pointer', ";"),
       "onClick": this.add
-    }, null) : createVNode("div", {
+    }, {
+      "default": function _default() {
+        return [createVNode(script$1, null, null)];
+      }
+    }) : createVNode("div", {
       "key": 2
     }, [keys.map(function (key, index) {
       var _slot;
 
-      var _this9$cacheRule$key = _this9.cacheRule[key],
-          rule = _this9$cacheRule$key.rule,
-          options = _this9$cacheRule$key.options;
+      var _this8$cacheRule$key = _this8.cacheRule[key],
+          rule = _this8$cacheRule$key.rule,
+          options = _this8$cacheRule$key.options;
       return createVNode(resolveComponent("ElRow"), {
         "align": "middle",
         "type": "flex",
@@ -467,19 +617,20 @@ var Group = defineComponent({
                 "default": function _default() {
                   return [createVNode(Type, {
                     "key": key,
+                    "inFor": true,
                     "onUpdate:modelValue": function onUpdateModelValue(formData) {
-                      return _this9.formData(key, formData);
+                      return _this8.formData(key, formData);
                     },
-                    "modelValue": _this9.field ? _defineProperty({}, _this9.field, _this9._value(_this9.modelValue[index])) : _this9.modelValue[index],
+                    "modelValue": _this8.field ? _defineProperty({}, _this8.field, _this8._value(_this8.modelValue[index])) : _this8.modelValue[index],
                     "onEmit-event": function onEmitEvent(name) {
                       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
                         args[_key - 1] = arguments[_key];
                       }
 
-                      return _this9.emitEvent(name, args, index, key);
+                      return _this8.emitEvent(name, args, index, key);
                     },
                     "onUpdate:api": function onUpdateApi($f) {
-                      return _this9.add$f(index, key, $f);
+                      return _this8.add$f(index, key, $f);
                     },
                     "rule": rule,
                     "option": options,
@@ -492,7 +643,7 @@ var Group = defineComponent({
             "span": 2,
             "pull": 1,
             "push": 1
-          }, _isSlot(_slot = _this9.makeIcon(keys.length, index, key)) ? _slot : {
+          }, _isSlot(_slot = _this8.makeIcon(keys.length, index, key)) ? _slot : {
             "default": function _default() {
               return [_slot];
             }

package/dist/index.esm.min.js

@@ -1,7 +1,7 @@
 /*!
- * @form-create/component-elm-group v3.1.0
+ * @form-create/component-elm-group v3.1.4
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create with group
  * Released under the MIT License.
  */
-import{defineComponent as e,markRaw as t,nextTick as n,createVNode as o,resolveComponent as r,isVNode as i}from"vue";function l(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function u(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?l(Object(n),!0).forEach((function(t){c(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function a(e){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a(e)}function c(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function s(e){return function(e){if(Array.isArray(e))return f(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return f(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return f(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function f(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}var d={type:function(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"},Undef:function(e){return null==e},Element:function(e){return"object"===a(e)&&null!==e&&1===e.nodeType&&!d.Object(e)},trueArray:function(e){return Array.isArray(e)&&e.length>0}};["Date","Object","Function","String","Boolean","Array","Number"].forEach((function(e){d[e]=function(t){return d.type(t,e)}}));var h=e({name:"fcGroup",props:{field:String,rule:Array,expand:Number,options:Object,button:{type:Boolean,default:!0},max:{type:Number,default:0},min:{type:Number,default:0},modelValue:{type:Array,default:function(){return[]}},disabled:{type:Boolean,default:!1},syncDisabled:{type:Boolean,default:!0},fontSize:{type:Number,default:28},onBeforeRemove:{type:Function,default:function(){}},onBeforeAdd:{type:Function,default:function(){}},formCreateInject:Object},data:function(){return{len:0,cacheRule:{},cacheValue:{},form:t(this.formCreateInject.form.$form())}},emits:["update:modelValue","change","itemMounted","remove"],watch:{disabled:function(e){if(this.syncDisabled){var t=this.cacheRule;Object.keys(t).forEach((function(n){t[n].$f.disabled(e)}))}},expand:function(e){var t=e-this.modelValue.length;t>0&&this.expandRule(t)},modelValue:{handler:function(e){var t=this;e=e||[];var n=Object.keys(this.cacheRule),o=n.length,r=o-e.length;if(r<0){for(var i=r;i<0;i++)this.addRule(e.length+i);for(var l=0;l<o;l++)this.setValue(n[l],e[l])}else{if(r>0){for(var u=0;u<r;u++)this.removeRule(n[o-u-1]);this.subForm()}e.forEach((function(o,r){t.setValue(n[r],e[r])}))}},deep:!0,flush:"post"}},methods:{_value:function(e){return e&&(t=e,n=this.field,{}.hasOwnProperty.call(t,n))?e[this.field]:e;var t,n},cache:function(e,t){this.cacheValue[e]=JSON.stringify(t)},input:function(e){this.$emit("update:modelValue",e),this.$emit("change",e)},formData:function(e,t){var n=this,o=this.cacheRule,r=Object.keys(o);if(r.filter((function(e){return o[e].$f})).length===r.length){var i=r.map((function(o){var r=e===o?t:u({},n.cacheRule[o].$f.form),i=n.field?r[n.field]||null:r;return n.cache(o,i),i}));this.input(i)}},setValue:function(e,t){var n=this.field;n&&(t=c({},n,this._value(t))),this.cacheValue[e]!==JSON.stringify(n?t[n]:t)&&this.cache(e,t)},addRule:function(e,t){var o=this,r=this.formCreateInject.form.copyRules(this.rule||[]),i=this.options?u({},this.options):{submitBtn:!1,resetBtn:!1};this.cacheRule[++this.len]={rule:r,options:i},t&&n((function(){return o.$emit("add",r,Object.keys(o.cacheRule).length-1)}))},add$f:function(e,t,o){var r=this;this.cacheRule[t].$f=o,this.subForm(),n((function(){r.syncDisabled&&o.disabled(r.disabled),r.$emit("itemMounted",o,Object.keys(r.cacheRule).indexOf(t))}))},subForm:function(){var e=this;this.formCreateInject.subForm(Object.keys(this.cacheRule).map((function(t){return e.cacheRule[t].$f})))},removeRule:function(e,t){var o=this,r=Object.keys(this.cacheRule).indexOf(e);delete this.cacheRule[e],delete this.cacheValue[e],t&&n((function(){return o.$emit("remove",r)}))},add:function(){this.disabled||!1===this.onBeforeAdd(this.modelValue)||(this.modelValue.push(this.field?null:{}),this.$emit("update:modelValue",this.modelValue))},del:function(e,t){this.disabled||!1===this.onBeforeRemove(this.modelValue,e)||(this.removeRule(t,!0),this.subForm(),this.modelValue.splice(e,1),this.input(this.modelValue))},addIcon:function(e){return o(r("el-icon"),{key:"a".concat(e),style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer",";"),onClick:this.add},{default:function(){return[o(r("circle-plus"),null,null)]}})},delIcon:function(e,t){var n=this;return o(r("ElIcon"),{key:"d".concat(t),class:"el-icon-remove-outline",style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer;color:#606266",";"),onClick:function(){return n.del(e,t)}},{default:function(){return[o(r("remove"),null,null)]}})},makeIcon:function(e,t,n){var o=this;return this.$slots.button?this.$slots.button({total:e,index:t,vm:this,key:n,del:function(){return o.del(t,n)},add:this.add}):0===t?[0!==this.max&&e>=this.max?null:this.addIcon(n),0===this.min||e>this.min?this.delIcon(t,n):null]:t>=this.min?this.delIcon(t,n):void 0},emitEvent:function(e,t,n,o){this.$emit.apply(this,[e].concat(s(t),[this.cacheRule[o].$f,n]))},expandRule:function(e){for(var t=0;t<e;t++)this.modelValue.push(this.field?null:{})}},created:function(){for(var e=(this.expand||0)-this.modelValue.length,t=0;t<this.modelValue.length;t++)this.addRule(t);e>0&&this.expandRule(e)},render:function(){var e=this,t=Object.keys(this.cacheRule),n=this.button,l=this.form;return 0===t.length?this.$slots.default?this.$slots.default({vm:this,add:this.add}):o("i",{key:1,class:"el-icon-circle-plus-outline",style:"font-size:".concat(this.fontSize,"px;vertical-align:middle;color:").concat(this.disabled?"#c9cdd4;cursor: not-allowed":"#606266;cursor:pointer",";"),onClick:this.add},null):o("div",{key:2},[t.map((function(u,a){var s,f=e.cacheRule[u],d=f.rule,h=f.options;return o(r("ElRow"),{align:"middle",type:"flex",key:u,style:"border-bottom:1px dashed #DCDFE6;margin-bottom:10px;"},{default:function(){return[o(r("ElCol"),{span:n?20:24},{default:function(){return[o(r("ElFormItem"),null,{default:function(){return[o(l,{key:u,"onUpdate:modelValue":function(t){return e.formData(u,t)},modelValue:e.field?c({},e.field,e._value(e.modelValue[a])):e.modelValue[a],"onEmit-event":function(t){for(var n=arguments.length,o=new Array(n>1?n-1:0),r=1;r<n;r++)o[r-1]=arguments[r];return e.emitEvent(t,o,a,u)},"onUpdate:api":function(t){return e.add$f(a,u,t)},rule:d,option:h,extendOption:!0},null)]}})]}}),n?o(r("ElCol"),{span:2,pull:1,push:1},(f=s=e.makeIcon(t.length,a,u),"function"==typeof f||"[object Object]"===Object.prototype.toString.call(f)&&!i(f)?s:{default:function(){return[s]}})):null];var f}})}))])}});export{h as default};
+import{openBlock as e,createElementBlock as t,createElementVNode as n,defineComponent as r,markRaw as o,nextTick as i,createVNode as l,resolveComponent as a,isVNode as u}from"vue";function c(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?c(Object(n),!0).forEach((function(t){d(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function f(e){return f="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},f(e)}function d(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function h(e){return function(e){if(Array.isArray(e))return p(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return p(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return p(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function p(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var m={type:function(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"},Undef:function(e){return null==e},Element:function(e){return"object"===f(e)&&null!==e&&1===e.nodeType&&!m.Object(e)},trueArray:function(e){return Array.isArray(e)&&e.length>0},Function:function(e){var t=this.getType(e);return"Function"===t||"AsyncFunction"===t},getType:function(e){var t=Object.prototype.toString.call(e);return/^\[object (.*)\]$/.exec(t)[1]},empty:function(e){return null==e||(!(!Array.isArray(e)||!Array.isArray(e)||e.length)||"string"==typeof e&&!e)}};["Date","Object","String","Boolean","Array","Number"].forEach((function(e){m[e]=function(t){return m.type(t,e)}}));var y={name:"IconCirclePlus"},b={class:"icon",viewBox:"0 0 1024 1024",xmlns:"http://www.w3.org/2000/svg"},v=[n("path",{fill:"currentColor",d:"M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"},null,-1),n("path",{fill:"currentColor",d:"M480 672V352a32 32 0 1164 0v320a32 32 0 01-64 0z"},null,-1),n("path",{fill:"currentColor",d:"M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"},null,-1)];y.render=function(n,r,o,i,l,a){return e(),t("svg",b,v)};var g={name:"IconRemove"},O={class:"icon",viewBox:"0 0 1024 1024",xmlns:"http://www.w3.org/2000/svg"},j=[n("path",{fill:"currentColor",d:"M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"},null,-1),n("path",{fill:"currentColor",d:"M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"},null,-1)];function V(e,t,n){e[t]=n}function w(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2?arguments[2]:void 0,r=!1;for(var o in t)if(Object.prototype.hasOwnProperty.call(t,o)){var i=t[o];if((r=Array.isArray(i))||m.Object(i)){var l=void 0===e[o];if(r)r=!1,l&&V(e,o,[]);else if(i._clone&&void 0!==n){if(!n){V(e,o,i._clone());continue}i=i.getRule(),l&&V(e,o,{})}else l&&V(e,o,{});e[o]=w(e[o],i,n)}else V(e,o,i),m.Undef(i)||(m.Undef(i.__json)||(e[o].__json=i.__json),m.Undef(i.__origin)||(e[o].__origin=i.__origin))}return void 0!==n&&Array.isArray(e)?e.filter((function(e){return!e||!e.__ctrl})):e}function R(e){return w({},{value:e}).value}g.render=function(n,r,o,i,l,a){return e(),t("svg",O,j)};var x=Object.assign||function(e){for(var t,n=1;n<arguments.length;n++)for(var r in t=arguments[n])Object.prototype.hasOwnProperty.call(t,r)&&V(e,r,t[r]);return e};var A=r({name:"fcGroup",props:{field:String,rule:Array,expand:Number,options:Object,button:{type:Boolean,default:!0},max:{type:Number,default:0},min:{type:Number,default:0},modelValue:{type:Array,default:function(){return[]}},defaultValue:Object,disabled:{type:Boolean,default:!1},syncDisabled:{type:Boolean,default:!0},fontSize:{type:Number,default:28},onBeforeRemove:{type:Function,default:function(){}},onBeforeAdd:{type:Function,default:function(){}},formCreateInject:Object},data:function(){return{len:0,cacheRule:{},cacheValue:{},form:o(this.formCreateInject.form.$form())}},emits:["update:modelValue","change","itemMounted","remove"],watch:{disabled:function(e){if(this.syncDisabled){var t=this.cacheRule;Object.keys(t).forEach((function(n){t[n].$f.disabled(e)}))}},expand:function(e){var t=e-this.modelValue.length;t>0&&this.expandRule(t)},modelValue:{handler:function(e){var t=this;e=e||[];var n=Object.keys(this.cacheRule),r=n.length,o=r-e.length;if(o<0){for(var i=o;i<0;i++)this.addRule(e.length+i);for(var l=0;l<r;l++)this.setValue(n[l],e[l])}else{if(o>0)for(var a=0;a<o;a++)this.removeRule(n[r-a-1]);e.forEach((function(r,o){t.setValue(n[o],e[o])}))}},deep:!0}},methods:{_value:function(e){return e&&(t=e,n=this.field,{}.hasOwnProperty.call(t,n))?e[this.field]:e;var t,n},cache:function(e,t){this.cacheValue[e]=JSON.stringify(t)},input:function(e){this.$emit("update:modelValue",e),this.$emit("change",e)},formData:function(e,t){var n=this,r=this.cacheRule,o=Object.keys(r);if(o.filter((function(e){return r[e].$f})).length===o.length){var i=o.map((function(r){var o=e===r?t:s({},n.cacheRule[r].$f.form),i=n.field?o[n.field]||null:o;return n.cache(r,i),i}));this.input(i)}},setValue:function(e,t){var n=this.field;n&&(t=d({},n,this._value(t))),this.cacheValue[e]!==JSON.stringify(n?t[n]:t)&&this.cache(e,t)},addRule:function(e,t){var n=this,r=this.formCreateInject.form.copyRules(this.rule||[]),o=this.options?s({},this.options):{submitBtn:!1,resetBtn:!1};if(this.defaultValue){o.formData||(o.formData={});var l=R(this.defaultValue);!function(){x.apply(this,arguments)}(o.formData,this.field?d({},this.field,l):l)}this.cacheRule[++this.len]={rule:r,options:o},t&&i((function(){return n.$emit("add",r,Object.keys(n.cacheRule).length-1)}))},add$f:function(e,t,n){var r=this;this.cacheRule[t].$f=n,this.formData(t,n.formData()),i((function(){r.syncDisabled&&n.disabled(r.disabled),r.$emit("itemMounted",n,Object.keys(r.cacheRule).indexOf(t))}))},removeRule:function(e,t){var n=this,r=Object.keys(this.cacheRule).indexOf(e);delete this.cacheRule[e],delete this.cacheValue[e],t&&i((function(){return n.$emit("remove",r)}))},add:function(){this.disabled||!1===this.onBeforeAdd(this.modelValue)||(this.modelValue.push(this.field?null:{}),this.$emit("update:modelValue",this.modelValue))},del:function(e,t){this.disabled||!1===this.onBeforeRemove(this.modelValue,e)||(this.removeRule(t,!0),this.modelValue.splice(e,1),this.input(this.modelValue))},addIcon:function(e){return l(a("ElIcon"),{key:"a".concat(e),style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer",";"),onClick:this.add},{default:function(){return[l(y,null,null)]}})},delIcon:function(e,t){var n=this;return l(a("ElIcon"),{key:"d".concat(t),class:"el-icon-remove-outline",style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer;color:#606266",";"),onClick:function(){return n.del(e,t)}},{default:function(){return[l(g,null,null)]}})},makeIcon:function(e,t,n){var r=this;return this.$slots.button?this.$slots.button({total:e,index:t,vm:this,key:n,del:function(){return r.del(t,n)},add:this.add}):0===t?[0!==this.max&&e>=this.max?null:this.addIcon(n),0===this.min||e>this.min?this.delIcon(t,n):null]:t>=this.min?this.delIcon(t,n):void 0},emitEvent:function(e,t,n,r){this.$emit.apply(this,[e].concat(h(t),[this.cacheRule[r].$f,n]))},expandRule:function(e){for(var t=0;t<e;t++)this.modelValue.push(this.field?null:{})}},created:function(){for(var e=(this.expand||0)-this.modelValue.length,t=0;t<this.modelValue.length;t++)this.addRule(t);e>0&&this.expandRule(e)},render:function(){var e=this,t=Object.keys(this.cacheRule),n=this.button,r=this.form;return 0===t.length?this.$slots.default?this.$slots.default({vm:this,add:this.add}):l(a("ElIcon"),{key:1,style:"font-size:".concat(this.fontSize,"px;vertical-align:middle;color:").concat(this.disabled?"#c9cdd4;cursor: not-allowed":"#606266;cursor:pointer",";"),onClick:this.add},{default:function(){return[l(y,null,null)]}}):l("div",{key:2},[t.map((function(o,i){var c,s=e.cacheRule[o],f=s.rule,h=s.options;return l(a("ElRow"),{align:"middle",type:"flex",key:o,style:"border-bottom:1px dashed #DCDFE6;margin-bottom:10px;"},{default:function(){return[l(a("ElCol"),{span:n?20:24},{default:function(){return[l(a("ElFormItem"),null,{default:function(){return[l(r,{key:o,inFor:!0,"onUpdate:modelValue":function(t){return e.formData(o,t)},modelValue:e.field?d({},e.field,e._value(e.modelValue[i])):e.modelValue[i],"onEmit-event":function(t){for(var n=arguments.length,r=new Array(n>1?n-1:0),l=1;l<n;l++)r[l-1]=arguments[l];return e.emitEvent(t,r,i,o)},"onUpdate:api":function(t){return e.add$f(i,o,t)},rule:f,option:h,extendOption:!0},null)]}})]}}),n?l(a("ElCol"),{span:2,pull:1,push:1},(s=c=e.makeIcon(t.length,i,o),"function"==typeof s||"[object Object]"===Object.prototype.toString.call(s)&&!u(s)?c:{default:function(){return[c]}})):null];var s}})}))])}});export{A as default};

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/component-elm-group v3.1.0
+ * @form-create/component-elm-group v3.1.4
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create with group
  * Released under the MIT License.
@@ -124,9 +124,28 @@
     },
     trueArray: function trueArray(data) {
       return Array.isArray(data) && data.length > 0;
+    },
+    Function: function Function(v) {
+      var type = this.getType(v);
+      return type === 'Function' || type === 'AsyncFunction';
+    },
+    getType: function getType(v) {
+      var str = Object.prototype.toString.call(v);
+      return /^\[object (.*)\]$/.exec(str)[1];
+    },
+    empty: function empty(value) {
+      if (value === undefined || value === null) {
+        return true;
+      }
+
+      if (Array.isArray(value) && Array.isArray(value) && !value.length) {
+        return true;
+      }
+
+      return typeof value === 'string' && !value;
     }
   };
-  ['Date', 'Object', 'Function', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
+  ['Date', 'Object', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
     is[t] = function (arg) {
       return is.type(arg, t);
     };
@@ -135,6 +154,137 @@
     return {}.hasOwnProperty.call(rule, k);
   }
 
+  var script$1 = {
+    name: 'IconCirclePlus'
+  };
+
+  var _hoisted_1$1 = {
+    "class": "icon",
+    viewBox: "0 0 1024 1024",
+    xmlns: "http://www.w3.org/2000/svg"
+  };
+
+  var _hoisted_2$1 = /*#__PURE__*/vue.createElementVNode("path", {
+    fill: "currentColor",
+    d: "M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"
+  }, null, -1);
+
+  var _hoisted_3$1 = /*#__PURE__*/vue.createElementVNode("path", {
+    fill: "currentColor",
+    d: "M480 672V352a32 32 0 1164 0v320a32 32 0 01-64 0z"
+  }, null, -1);
+
+  var _hoisted_4$1 = /*#__PURE__*/vue.createElementVNode("path", {
+    fill: "currentColor",
+    d: "M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"
+  }, null, -1);
+
+  var _hoisted_5 = [_hoisted_2$1, _hoisted_3$1, _hoisted_4$1];
+  function render$1(_ctx, _cache, $props, $setup, $data, $options) {
+    return vue.openBlock(), vue.createElementBlock("svg", _hoisted_1$1, _hoisted_5);
+  }
+
+  script$1.render = render$1;
+
+  var script = {
+    name: 'IconRemove'
+  };
+
+  var _hoisted_1 = {
+    "class": "icon",
+    viewBox: "0 0 1024 1024",
+    xmlns: "http://www.w3.org/2000/svg"
+  };
+
+  var _hoisted_2 = /*#__PURE__*/vue.createElementVNode("path", {
+    fill: "currentColor",
+    d: "M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"
+  }, null, -1);
+
+  var _hoisted_3 = /*#__PURE__*/vue.createElementVNode("path", {
+    fill: "currentColor",
+    d: "M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"
+  }, null, -1);
+
+  var _hoisted_4 = [_hoisted_2, _hoisted_3];
+  function render(_ctx, _cache, $props, $setup, $data, $options) {
+    return vue.openBlock(), vue.createElementBlock("svg", _hoisted_1, _hoisted_4);
+  }
+
+  script.render = render;
+
+  function $set(target, field, value) {
+    target[field] = value;
+  }
+
+  function deepExtend(origin) {
+    var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var mode = arguments.length > 2 ? arguments[2] : undefined;
+    var isArr = false;
+
+    for (var key in target) {
+      if (Object.prototype.hasOwnProperty.call(target, key)) {
+        var clone = target[key];
+
+        if ((isArr = Array.isArray(clone)) || is.Object(clone)) {
+          var nst = origin[key] === undefined;
+
+          if (isArr) {
+            isArr = false;
+            nst && $set(origin, key, []);
+          } else if (clone._clone && mode !== undefined) {
+            if (mode) {
+              clone = clone.getRule();
+              nst && $set(origin, key, {});
+            } else {
+              $set(origin, key, clone._clone());
+              continue;
+            }
+          } else {
+            nst && $set(origin, key, {});
+          }
+
+          origin[key] = deepExtend(origin[key], clone, mode);
+        } else {
+          $set(origin, key, clone);
+
+          if (!is.Undef(clone)) {
+            if (!is.Undef(clone.__json)) {
+              origin[key].__json = clone.__json;
+            }
+
+            if (!is.Undef(clone.__origin)) {
+              origin[key].__origin = clone.__origin;
+            }
+          }
+        }
+      }
+    }
+
+    return mode !== undefined && Array.isArray(origin) ? origin.filter(function (v) {
+      return !v || !v.__ctrl;
+    }) : origin;
+  }
+  function deepCopy(value) {
+    return deepExtend({}, {
+      value: value
+    }).value;
+  }
+
+  var _extends = Object.assign || function (a) {
+    for (var b, c = 1; c < arguments.length; c++) {
+      for (var d in b = arguments[c], b) {
+        Object.prototype.hasOwnProperty.call(b, d) && $set(a, d, b[d]);
+      }
+    }
+
+    return a;
+  };
+
+  function extend() {
+    return _extends.apply(this, arguments);
+  }
+
   function _isSlot(s) {
     return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !vue.isVNode(s);
   }
@@ -165,6 +315,7 @@
           return [];
         }
       },
+      defaultValue: Object,
       disabled: {
         type: Boolean,
         "default": false
@@ -234,8 +385,6 @@
               for (var _i2 = 0; _i2 < len; _i2++) {
                 this.removeRule(keys[total - _i2 - 1]);
               }
-
-              this.subForm();
             }
 
             n.forEach(function (val, i) {
@@ -243,8 +392,7 @@
             });
           }
         },
-        deep: true,
-        flush: 'post'
+        deep: true
       }
     },
     methods: {
@@ -301,6 +449,13 @@
           submitBtn: false,
           resetBtn: false
         };
+
+        if (this.defaultValue) {
+          if (!options.formData) options.formData = {};
+          var defVal = deepCopy(this.defaultValue);
+          extend(options.formData, this.field ? _defineProperty({}, this.field, defVal) : defVal);
+        }
+
         this.cacheRule[++this.len] = {
           rule: rule,
           options: options
@@ -316,7 +471,7 @@
         var _this4 = this;
 
         this.cacheRule[key].$f = $f;
-        this.subForm();
+        this.formData(key, $f.formData());
         vue.nextTick(function () {
           if (_this4.syncDisabled) {
             $f.disabled(_this4.disabled);
@@ -325,15 +480,8 @@
           _this4.$emit('itemMounted', $f, Object.keys(_this4.cacheRule).indexOf(key));
         });
       },
-      subForm: function subForm() {
-        var _this5 = this;
-
-        this.formCreateInject.subForm(Object.keys(this.cacheRule).map(function (k) {
-          return _this5.cacheRule[k].$f;
-        }));
-      },
       removeRule: function removeRule(key, emit) {
-        var _this6 = this;
+        var _this5 = this;
 
         var index = Object.keys(this.cacheRule).indexOf(key);
         delete this.cacheRule[key];
@@ -341,7 +489,7 @@
 
         if (emit) {
           vue.nextTick(function () {
-            return _this6.$emit('remove', index);
+            return _this5.$emit('remove', index);
           });
         }
       },
@@ -359,39 +507,38 @@
         }
 
         this.removeRule(key, true);
-        this.subForm();
         this.modelValue.splice(index, 1);
         this.input(this.modelValue);
       },
       addIcon: function addIcon(key) {
-        return vue.createVNode(vue.resolveComponent("el-icon"), {
+        return vue.createVNode(vue.resolveComponent("ElIcon"), {
           "key": "a".concat(key),
           "style": "font-size:".concat(this.fontSize, "px;cursor:").concat(this.disabled ? 'not-allowed;color:#c9cdd4' : 'pointer', ";"),
           "onClick": this.add
         }, {
           "default": function _default() {
-            return [vue.createVNode(vue.resolveComponent("circle-plus"), null, null)];
+            return [vue.createVNode(script$1, null, null)];
           }
         });
       },
       delIcon: function delIcon(index, key) {
-        var _this7 = this;
+        var _this6 = this;
 
         return vue.createVNode(vue.resolveComponent("ElIcon"), {
           "key": "d".concat(key),
           "class": "el-icon-remove-outline",
           "style": "font-size:".concat(this.fontSize, "px;cursor:").concat(this.disabled ? 'not-allowed;color:#c9cdd4' : 'pointer;color:#606266', ";"),
           "onClick": function onClick() {
-            return _this7.del(index, key);
+            return _this6.del(index, key);
           }
         }, {
           "default": function _default() {
-            return [vue.createVNode(vue.resolveComponent("remove"), null, null)];
+            return [vue.createVNode(script, null, null)];
           }
         });
       },
       makeIcon: function makeIcon(total, index, key) {
-        var _this8 = this;
+        var _this7 = this;
 
         if (this.$slots.button) {
           return this.$slots.button({
@@ -400,7 +547,7 @@
             vm: this,
             key: key,
             del: function del() {
-              return _this8.del(index, key);
+              return _this7.del(index, key);
             },
             add: this.add
           });
@@ -435,7 +582,7 @@
       }
     },
     render: function render() {
-      var _this9 = this;
+      var _this8 = this;
 
       var keys = Object.keys(this.cacheRule);
       var button = this.button;
@@ -443,19 +590,22 @@
       return keys.length === 0 ? this.$slots["default"] ? this.$slots["default"]({
         vm: this,
         add: this.add
-      }) : vue.createVNode("i", {
+      }) : vue.createVNode(vue.resolveComponent("ElIcon"), {
         "key": 1,
-        "class": "el-icon-circle-plus-outline",
         "style": "font-size:".concat(this.fontSize, "px;vertical-align:middle;color:").concat(this.disabled ? '#c9cdd4;cursor: not-allowed' : '#606266;cursor:pointer', ";"),
         "onClick": this.add
-      }, null) : vue.createVNode("div", {
+      }, {
+        "default": function _default() {
+          return [vue.createVNode(script$1, null, null)];
+        }
+      }) : vue.createVNode("div", {
         "key": 2
       }, [keys.map(function (key, index) {
         var _slot;
 
-        var _this9$cacheRule$key = _this9.cacheRule[key],
-            rule = _this9$cacheRule$key.rule,
-            options = _this9$cacheRule$key.options;
+        var _this8$cacheRule$key = _this8.cacheRule[key],
+            rule = _this8$cacheRule$key.rule,
+            options = _this8$cacheRule$key.options;
         return vue.createVNode(vue.resolveComponent("ElRow"), {
           "align": "middle",
           "type": "flex",
@@ -471,19 +621,20 @@
                   "default": function _default() {
                     return [vue.createVNode(Type, {
                       "key": key,
+                      "inFor": true,
                       "onUpdate:modelValue": function onUpdateModelValue(formData) {
-                        return _this9.formData(key, formData);
+                        return _this8.formData(key, formData);
                       },
-                      "modelValue": _this9.field ? _defineProperty({}, _this9.field, _this9._value(_this9.modelValue[index])) : _this9.modelValue[index],
+                      "modelValue": _this8.field ? _defineProperty({}, _this8.field, _this8._value(_this8.modelValue[index])) : _this8.modelValue[index],
                       "onEmit-event": function onEmitEvent(name) {
                         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
                           args[_key - 1] = arguments[_key];
                         }
 
-                        return _this9.emitEvent(name, args, index, key);
+                        return _this8.emitEvent(name, args, index, key);
                       },
                       "onUpdate:api": function onUpdateApi($f) {
-                        return _this9.add$f(index, key, $f);
+                        return _this8.add$f(index, key, $f);
                       },
                       "rule": rule,
                       "option": options,
@@ -496,7 +647,7 @@
               "span": 2,
               "pull": 1,
               "push": 1
-            }, _isSlot(_slot = _this9.makeIcon(keys.length, index, key)) ? _slot : {
+            }, _isSlot(_slot = _this8.makeIcon(keys.length, index, key)) ? _slot : {
               "default": function _default() {
                 return [_slot];
               }

package/dist/index.min.js

@@ -1,7 +1,7 @@
 /*!
- * @form-create/component-elm-group v3.1.0
+ * @form-create/component-elm-group v3.1.4
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create with group
  * Released under the MIT License.
  */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("vue")):"function"==typeof define&&define.amd?define(["exports","vue"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).FcGroup={},e.Vue)}(this,(function(e,t){"use strict";function n(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function o(e){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{};t%2?n(Object(o),!0).forEach((function(t){i(e,t,o[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):n(Object(o)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))}))}return e}function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function l(e){return function(e){if(Array.isArray(e))return u(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return u(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return u(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function u(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}var c={type:function(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"},Undef:function(e){return null==e},Element:function(e){return"object"===r(e)&&null!==e&&1===e.nodeType&&!c.Object(e)},trueArray:function(e){return Array.isArray(e)&&e.length>0}};["Date","Object","Function","String","Boolean","Array","Number"].forEach((function(e){c[e]=function(t){return c.type(t,e)}}));var a=t.defineComponent({name:"fcGroup",props:{field:String,rule:Array,expand:Number,options:Object,button:{type:Boolean,default:!0},max:{type:Number,default:0},min:{type:Number,default:0},modelValue:{type:Array,default:function(){return[]}},disabled:{type:Boolean,default:!1},syncDisabled:{type:Boolean,default:!0},fontSize:{type:Number,default:28},onBeforeRemove:{type:Function,default:function(){}},onBeforeAdd:{type:Function,default:function(){}},formCreateInject:Object},data:function(){return{len:0,cacheRule:{},cacheValue:{},form:t.markRaw(this.formCreateInject.form.$form())}},emits:["update:modelValue","change","itemMounted","remove"],watch:{disabled:function(e){if(this.syncDisabled){var t=this.cacheRule;Object.keys(t).forEach((function(n){t[n].$f.disabled(e)}))}},expand:function(e){var t=e-this.modelValue.length;t>0&&this.expandRule(t)},modelValue:{handler:function(e){var t=this;e=e||[];var n=Object.keys(this.cacheRule),o=n.length,r=o-e.length;if(r<0){for(var i=r;i<0;i++)this.addRule(e.length+i);for(var l=0;l<o;l++)this.setValue(n[l],e[l])}else{if(r>0){for(var u=0;u<r;u++)this.removeRule(n[o-u-1]);this.subForm()}e.forEach((function(o,r){t.setValue(n[r],e[r])}))}},deep:!0,flush:"post"}},methods:{_value:function(e){return e&&(t=e,n=this.field,{}.hasOwnProperty.call(t,n))?e[this.field]:e;var t,n},cache:function(e,t){this.cacheValue[e]=JSON.stringify(t)},input:function(e){this.$emit("update:modelValue",e),this.$emit("change",e)},formData:function(e,t){var n=this,r=this.cacheRule,i=Object.keys(r);if(i.filter((function(e){return r[e].$f})).length===i.length){var l=i.map((function(r){var i=e===r?t:o({},n.cacheRule[r].$f.form),l=n.field?i[n.field]||null:i;return n.cache(r,l),l}));this.input(l)}},setValue:function(e,t){var n=this.field;n&&(t=i({},n,this._value(t))),this.cacheValue[e]!==JSON.stringify(n?t[n]:t)&&this.cache(e,t)},addRule:function(e,n){var r=this,i=this.formCreateInject.form.copyRules(this.rule||[]),l=this.options?o({},this.options):{submitBtn:!1,resetBtn:!1};this.cacheRule[++this.len]={rule:i,options:l},n&&t.nextTick((function(){return r.$emit("add",i,Object.keys(r.cacheRule).length-1)}))},add$f:function(e,n,o){var r=this;this.cacheRule[n].$f=o,this.subForm(),t.nextTick((function(){r.syncDisabled&&o.disabled(r.disabled),r.$emit("itemMounted",o,Object.keys(r.cacheRule).indexOf(n))}))},subForm:function(){var e=this;this.formCreateInject.subForm(Object.keys(this.cacheRule).map((function(t){return e.cacheRule[t].$f})))},removeRule:function(e,n){var o=this,r=Object.keys(this.cacheRule).indexOf(e);delete this.cacheRule[e],delete this.cacheValue[e],n&&t.nextTick((function(){return o.$emit("remove",r)}))},add:function(){this.disabled||!1===this.onBeforeAdd(this.modelValue)||(this.modelValue.push(this.field?null:{}),this.$emit("update:modelValue",this.modelValue))},del:function(e,t){this.disabled||!1===this.onBeforeRemove(this.modelValue,e)||(this.removeRule(t,!0),this.subForm(),this.modelValue.splice(e,1),this.input(this.modelValue))},addIcon:function(e){return t.createVNode(t.resolveComponent("el-icon"),{key:"a".concat(e),style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer",";"),onClick:this.add},{default:function(){return[t.createVNode(t.resolveComponent("circle-plus"),null,null)]}})},delIcon:function(e,n){var o=this;return t.createVNode(t.resolveComponent("ElIcon"),{key:"d".concat(n),class:"el-icon-remove-outline",style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer;color:#606266",";"),onClick:function(){return o.del(e,n)}},{default:function(){return[t.createVNode(t.resolveComponent("remove"),null,null)]}})},makeIcon:function(e,t,n){var o=this;return this.$slots.button?this.$slots.button({total:e,index:t,vm:this,key:n,del:function(){return o.del(t,n)},add:this.add}):0===t?[0!==this.max&&e>=this.max?null:this.addIcon(n),0===this.min||e>this.min?this.delIcon(t,n):null]:t>=this.min?this.delIcon(t,n):void 0},emitEvent:function(e,t,n,o){this.$emit.apply(this,[e].concat(l(t),[this.cacheRule[o].$f,n]))},expandRule:function(e){for(var t=0;t<e;t++)this.modelValue.push(this.field?null:{})}},created:function(){for(var e=(this.expand||0)-this.modelValue.length,t=0;t<this.modelValue.length;t++)this.addRule(t);e>0&&this.expandRule(e)},render:function(){var e=this,n=Object.keys(this.cacheRule),o=this.button,r=this.form;return 0===n.length?this.$slots.default?this.$slots.default({vm:this,add:this.add}):t.createVNode("i",{key:1,class:"el-icon-circle-plus-outline",style:"font-size:".concat(this.fontSize,"px;vertical-align:middle;color:").concat(this.disabled?"#c9cdd4;cursor: not-allowed":"#606266;cursor:pointer",";"),onClick:this.add},null):t.createVNode("div",{key:2},[n.map((function(l,u){var c,a=e.cacheRule[l],s=a.rule,f=a.options;return t.createVNode(t.resolveComponent("ElRow"),{align:"middle",type:"flex",key:l,style:"border-bottom:1px dashed #DCDFE6;margin-bottom:10px;"},{default:function(){return[t.createVNode(t.resolveComponent("ElCol"),{span:o?20:24},{default:function(){return[t.createVNode(t.resolveComponent("ElFormItem"),null,{default:function(){return[t.createVNode(r,{key:l,"onUpdate:modelValue":function(t){return e.formData(l,t)},modelValue:e.field?i({},e.field,e._value(e.modelValue[u])):e.modelValue[u],"onEmit-event":function(t){for(var n=arguments.length,o=new Array(n>1?n-1:0),r=1;r<n;r++)o[r-1]=arguments[r];return e.emitEvent(t,o,u,l)},"onUpdate:api":function(t){return e.add$f(u,l,t)},rule:s,option:f,extendOption:!0},null)]}})]}}),o?t.createVNode(t.resolveComponent("ElCol"),{span:2,pull:1,push:1},(a=c=e.makeIcon(n.length,u,l),"function"==typeof a||"[object Object]"===Object.prototype.toString.call(a)&&!t.isVNode(a)?c:{default:function(){return[c]}})):null];var a}})}))])}});e.default=a,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("vue")):"function"==typeof define&&define.amd?define(["exports","vue"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).FcGroup={},e.Vue)}(this,(function(e,t){"use strict";function n(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function o(e){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{};t%2?n(Object(o),!0).forEach((function(t){i(e,t,o[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):n(Object(o)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))}))}return e}function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function l(e){return function(e){if(Array.isArray(e))return a(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return a(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return a(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function a(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}var u={type:function(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"},Undef:function(e){return null==e},Element:function(e){return"object"===r(e)&&null!==e&&1===e.nodeType&&!u.Object(e)},trueArray:function(e){return Array.isArray(e)&&e.length>0},Function:function(e){var t=this.getType(e);return"Function"===t||"AsyncFunction"===t},getType:function(e){var t=Object.prototype.toString.call(e);return/^\[object (.*)\]$/.exec(t)[1]},empty:function(e){return null==e||(!(!Array.isArray(e)||!Array.isArray(e)||e.length)||"string"==typeof e&&!e)}};["Date","Object","String","Boolean","Array","Number"].forEach((function(e){u[e]=function(t){return u.type(t,e)}}));var c={name:"IconCirclePlus"},s={class:"icon",viewBox:"0 0 1024 1024",xmlns:"http://www.w3.org/2000/svg"},f=[t.createElementVNode("path",{fill:"currentColor",d:"M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"},null,-1),t.createElementVNode("path",{fill:"currentColor",d:"M480 672V352a32 32 0 1164 0v320a32 32 0 01-64 0z"},null,-1),t.createElementVNode("path",{fill:"currentColor",d:"M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"},null,-1)];c.render=function(e,n,o,r,i,l){return t.openBlock(),t.createElementBlock("svg",s,f)};var d={name:"IconRemove"},h={class:"icon",viewBox:"0 0 1024 1024",xmlns:"http://www.w3.org/2000/svg"},p=[t.createElementVNode("path",{fill:"currentColor",d:"M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"},null,-1),t.createElementVNode("path",{fill:"currentColor",d:"M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"},null,-1)];function m(e,t,n){e[t]=n}function y(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2?arguments[2]:void 0,o=!1;for(var r in t)if(Object.prototype.hasOwnProperty.call(t,r)){var i=t[r];if((o=Array.isArray(i))||u.Object(i)){var l=void 0===e[r];if(o)o=!1,l&&m(e,r,[]);else if(i._clone&&void 0!==n){if(!n){m(e,r,i._clone());continue}i=i.getRule(),l&&m(e,r,{})}else l&&m(e,r,{});e[r]=y(e[r],i,n)}else m(e,r,i),u.Undef(i)||(u.Undef(i.__json)||(e[r].__json=i.__json),u.Undef(i.__origin)||(e[r].__origin=i.__origin))}return void 0!==n&&Array.isArray(e)?e.filter((function(e){return!e||!e.__ctrl})):e}function v(e){return y({},{value:e}).value}d.render=function(e,n,o,r,i,l){return t.openBlock(),t.createElementBlock("svg",h,p)};var b=Object.assign||function(e){for(var t,n=1;n<arguments.length;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&m(e,o,t[o]);return e};var g=t.defineComponent({name:"fcGroup",props:{field:String,rule:Array,expand:Number,options:Object,button:{type:Boolean,default:!0},max:{type:Number,default:0},min:{type:Number,default:0},modelValue:{type:Array,default:function(){return[]}},defaultValue:Object,disabled:{type:Boolean,default:!1},syncDisabled:{type:Boolean,default:!0},fontSize:{type:Number,default:28},onBeforeRemove:{type:Function,default:function(){}},onBeforeAdd:{type:Function,default:function(){}},formCreateInject:Object},data:function(){return{len:0,cacheRule:{},cacheValue:{},form:t.markRaw(this.formCreateInject.form.$form())}},emits:["update:modelValue","change","itemMounted","remove"],watch:{disabled:function(e){if(this.syncDisabled){var t=this.cacheRule;Object.keys(t).forEach((function(n){t[n].$f.disabled(e)}))}},expand:function(e){var t=e-this.modelValue.length;t>0&&this.expandRule(t)},modelValue:{handler:function(e){var t=this;e=e||[];var n=Object.keys(this.cacheRule),o=n.length,r=o-e.length;if(r<0){for(var i=r;i<0;i++)this.addRule(e.length+i);for(var l=0;l<o;l++)this.setValue(n[l],e[l])}else{if(r>0)for(var a=0;a<r;a++)this.removeRule(n[o-a-1]);e.forEach((function(o,r){t.setValue(n[r],e[r])}))}},deep:!0}},methods:{_value:function(e){return e&&(t=e,n=this.field,{}.hasOwnProperty.call(t,n))?e[this.field]:e;var t,n},cache:function(e,t){this.cacheValue[e]=JSON.stringify(t)},input:function(e){this.$emit("update:modelValue",e),this.$emit("change",e)},formData:function(e,t){var n=this,r=this.cacheRule,i=Object.keys(r);if(i.filter((function(e){return r[e].$f})).length===i.length){var l=i.map((function(r){var i=e===r?t:o({},n.cacheRule[r].$f.form),l=n.field?i[n.field]||null:i;return n.cache(r,l),l}));this.input(l)}},setValue:function(e,t){var n=this.field;n&&(t=i({},n,this._value(t))),this.cacheValue[e]!==JSON.stringify(n?t[n]:t)&&this.cache(e,t)},addRule:function(e,n){var r=this,l=this.formCreateInject.form.copyRules(this.rule||[]),a=this.options?o({},this.options):{submitBtn:!1,resetBtn:!1};if(this.defaultValue){a.formData||(a.formData={});var u=v(this.defaultValue);!function(){b.apply(this,arguments)}(a.formData,this.field?i({},this.field,u):u)}this.cacheRule[++this.len]={rule:l,options:a},n&&t.nextTick((function(){return r.$emit("add",l,Object.keys(r.cacheRule).length-1)}))},add$f:function(e,n,o){var r=this;this.cacheRule[n].$f=o,this.formData(n,o.formData()),t.nextTick((function(){r.syncDisabled&&o.disabled(r.disabled),r.$emit("itemMounted",o,Object.keys(r.cacheRule).indexOf(n))}))},removeRule:function(e,n){var o=this,r=Object.keys(this.cacheRule).indexOf(e);delete this.cacheRule[e],delete this.cacheValue[e],n&&t.nextTick((function(){return o.$emit("remove",r)}))},add:function(){this.disabled||!1===this.onBeforeAdd(this.modelValue)||(this.modelValue.push(this.field?null:{}),this.$emit("update:modelValue",this.modelValue))},del:function(e,t){this.disabled||!1===this.onBeforeRemove(this.modelValue,e)||(this.removeRule(t,!0),this.modelValue.splice(e,1),this.input(this.modelValue))},addIcon:function(e){return t.createVNode(t.resolveComponent("ElIcon"),{key:"a".concat(e),style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer",";"),onClick:this.add},{default:function(){return[t.createVNode(c,null,null)]}})},delIcon:function(e,n){var o=this;return t.createVNode(t.resolveComponent("ElIcon"),{key:"d".concat(n),class:"el-icon-remove-outline",style:"font-size:".concat(this.fontSize,"px;cursor:").concat(this.disabled?"not-allowed;color:#c9cdd4":"pointer;color:#606266",";"),onClick:function(){return o.del(e,n)}},{default:function(){return[t.createVNode(d,null,null)]}})},makeIcon:function(e,t,n){var o=this;return this.$slots.button?this.$slots.button({total:e,index:t,vm:this,key:n,del:function(){return o.del(t,n)},add:this.add}):0===t?[0!==this.max&&e>=this.max?null:this.addIcon(n),0===this.min||e>this.min?this.delIcon(t,n):null]:t>=this.min?this.delIcon(t,n):void 0},emitEvent:function(e,t,n,o){this.$emit.apply(this,[e].concat(l(t),[this.cacheRule[o].$f,n]))},expandRule:function(e){for(var t=0;t<e;t++)this.modelValue.push(this.field?null:{})}},created:function(){for(var e=(this.expand||0)-this.modelValue.length,t=0;t<this.modelValue.length;t++)this.addRule(t);e>0&&this.expandRule(e)},render:function(){var e=this,n=Object.keys(this.cacheRule),o=this.button,r=this.form;return 0===n.length?this.$slots.default?this.$slots.default({vm:this,add:this.add}):t.createVNode(t.resolveComponent("ElIcon"),{key:1,style:"font-size:".concat(this.fontSize,"px;vertical-align:middle;color:").concat(this.disabled?"#c9cdd4;cursor: not-allowed":"#606266;cursor:pointer",";"),onClick:this.add},{default:function(){return[t.createVNode(c,null,null)]}}):t.createVNode("div",{key:2},[n.map((function(l,a){var u,c=e.cacheRule[l],s=c.rule,f=c.options;return t.createVNode(t.resolveComponent("ElRow"),{align:"middle",type:"flex",key:l,style:"border-bottom:1px dashed #DCDFE6;margin-bottom:10px;"},{default:function(){return[t.createVNode(t.resolveComponent("ElCol"),{span:o?20:24},{default:function(){return[t.createVNode(t.resolveComponent("ElFormItem"),null,{default:function(){return[t.createVNode(r,{key:l,inFor:!0,"onUpdate:modelValue":function(t){return e.formData(l,t)},modelValue:e.field?i({},e.field,e._value(e.modelValue[a])):e.modelValue[a],"onEmit-event":function(t){for(var n=arguments.length,o=new Array(n>1?n-1:0),r=1;r<n;r++)o[r-1]=arguments[r];return e.emitEvent(t,o,a,l)},"onUpdate:api":function(t){return e.add$f(a,l,t)},rule:s,option:f,extendOption:!0},null)]}})]}}),o?t.createVNode(t.resolveComponent("ElCol"),{span:2,pull:1,push:1},(c=u=e.makeIcon(n.length,a,l),"function"==typeof c||"[object Object]"===Object.prototype.toString.call(c)&&!t.isVNode(c)?u:{default:function(){return[u]}})):null];var c}})}))])}});e.default=g,Object.defineProperty(e,"__esModule",{value:!0})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@form-create/component-elm-group",
-  "version": "3.1.1",
+  "version": "3.1.4",
   "description": "@form-create/element-ui 内置组件",
   "main": "./dist/index.min.js",
   "module": "./dist/index.esm.js",
@@ -30,7 +30,7 @@
   "author": "xaboy",
   "license": "MIT",
   "dependencies": {
-    "@form-create/utils": "^3.1.1"
+    "@form-create/utils": "^3.1.3"
   },
   "bugs": {
     "url": "https://github.com/xaboy/form-create/issues"
@@ -47,5 +47,5 @@
       "esm"
     ]
   },
-  "gitHead": "3d024534b3ee103a96da1d3629582c0cdf19d9a8"
+  "gitHead": "060ecdb8dd0f8893fa0e47415ef727472ffb381f"
 }

package/src/IconCirclePlus.vue

@@ -0,0 +1,14 @@
+<template>
+  <svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+    <path fill="currentColor" d="M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"></path>
+    <path fill="currentColor" d="M480 672V352a32 32 0 1164 0v320a32 32 0 01-64 0z"></path>
+    <path fill="currentColor"
+          d="M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"></path>
+  </svg>
+</template>
+
+<script>
+export default {
+    name: 'IconCirclePlus'
+}
+</script>

package/src/IconRemove.vue

@@ -0,0 +1,13 @@
+<template>
+  <svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+    <path fill="currentColor" d="M352 480h320a32 32 0 110 64H352a32 32 0 010-64z"></path>
+    <path fill="currentColor"
+          d="M512 896a384 384 0 100-768 384 384 0 000 768zm0 64a448 448 0 110-896 448 448 0 010 896z"></path>
+  </svg>
+</template>
+
+<script>
+export default {
+    name: 'IconRemove'
+}
+</script>

package/src/component.jsx

@@ -1,5 +1,9 @@
 import {hasProperty} from '@form-create/utils/lib/type';
 import {defineComponent, markRaw, nextTick} from 'vue';
+import IconCirclePlus from './IconCirclePlus.vue';
+import IconRemove from './IconRemove.vue';
+import {deepCopy} from '@form-create/utils/lib/deepextend';
+import extend from '@form-create/utils/lib/extend';
 
 const NAME = 'fcGroup';
 
@@ -26,6 +30,7 @@ export default defineComponent({
             type: Array,
             default: () => []
         },
+        defaultValue: Object,
         disabled: {
             type: Boolean,
             default: false
@@ -90,7 +95,6 @@ export default defineComponent({
                         for (let i = 0; i < len; i++) {
                             this.removeRule(keys[total - i - 1]);
                         }
-                        this.subForm();
                     }
                     n.forEach((val, i) => {
                         this.setValue(keys[i], n[i]);
@@ -98,7 +102,6 @@ export default defineComponent({
                 }
             },
             deep: true,
-            flush: 'post',
         }
     },
     methods: {
@@ -142,6 +145,11 @@ export default defineComponent({
                 submitBtn: false,
                 resetBtn: false,
             };
+            if (this.defaultValue) {
+                if (!options.formData) options.formData = {};
+                const defVal = deepCopy(this.defaultValue);
+                extend(options.formData, this.field ? {[this.field]: defVal} : defVal);
+            }
             this.cacheRule[++this.len] = {rule, options};
             if (emit) {
                 nextTick(() => this.$emit('add', rule, Object.keys(this.cacheRule).length - 1));
@@ -149,7 +157,7 @@ export default defineComponent({
         },
         add$f(i, key, $f) {
             this.cacheRule[key].$f = $f;
-            this.subForm();
+            this.formData(key, $f.formData());
             nextTick(() => {
                 if (this.syncDisabled) {
                     $f.disabled(this.disabled);
@@ -157,9 +165,6 @@ export default defineComponent({
                 this.$emit('itemMounted', $f, Object.keys(this.cacheRule).indexOf(key));
             });
         },
-        subForm() {
-            this.formCreateInject.subForm(Object.keys(this.cacheRule).map(k => this.cacheRule[k].$f));
-        },
         removeRule(key, emit) {
             const index = Object.keys(this.cacheRule).indexOf(key);
             delete this.cacheRule[key];
@@ -180,22 +185,21 @@ export default defineComponent({
                 return;
             }
             this.removeRule(key, true);
-            this.subForm();
             this.modelValue.splice(index, 1);
             this.input(this.modelValue);
         },
         addIcon(key) {
-            return <el-icon key={`a${key}`}
+            return <ElIcon key={`a${key}`}
                 style={`font-size:${this.fontSize}px;cursor:${this.disabled ? 'not-allowed;color:#c9cdd4' : 'pointer'};`}
                 onClick={this.add}>
-                <circle-plus/>
-            </el-icon>
+                <IconCirclePlus/>
+            </ElIcon>
         },
         delIcon(index, key) {
             return <ElIcon key={`d${key}`} class="el-icon-remove-outline"
                 style={`font-size:${this.fontSize}px;cursor:${this.disabled ? 'not-allowed;color:#c9cdd4' : 'pointer;color:#606266'};`}
                 onClick={() => this.del(index, key)}>
-                <remove/>
+                <IconRemove/>
             </ElIcon>
         },
         makeIcon(total, index, key) {
@@ -242,15 +246,17 @@ export default defineComponent({
             (this.$slots.default ? (this.$slots.default({
                 vm: this,
                 add: this.add
-            })) : <i key={1} class="el-icon-circle-plus-outline"
+            })) : <ElIcon key={1}
                 style={`font-size:${this.fontSize}px;vertical-align:middle;color:${this.disabled ? '#c9cdd4;cursor: not-allowed' : '#606266;cursor:pointer'};`}
-                onClick={this.add}/>) :
+                onClick={this.add}>
+                <IconCirclePlus/>
+            </ElIcon>) :
             <div key={2}>{keys.map((key, index) => {
                 const {rule, options} = this.cacheRule[key];
                 return <ElRow align="middle" type="flex" key={key}
                     style="border-bottom:1px dashed #DCDFE6;margin-bottom:10px;">
                     <ElCol span={button ? 20 : 24}><ElFormItem><Type
-                        key={key}
+                        key={key} inFor={true}
                         onUpdate:modelValue={(formData) => this.formData(key, formData)}
                         modelValue={this.field ? {[this.field]: this._value(this.modelValue[index])} : this.modelValue[index]}
                         onEmit-event={(name, ...args) => this.emitEvent(name, args, index, key)}