@form-create/element-ui 2.5.32 → 2.5.33

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v2.5.32
+ * @form-create/element-ui v2.5.33
  * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -947,10 +947,7 @@
       }
     },
     render: function render(h, ctx) {
-      var options = ctx.props.formCreateInject.options;
-      return h("ElSelect", helper([{}, ctx.data, {
-        "ref": "el"
-      }]), [(Array.isArray(options) ? options : []).map(function (props, index) {
+      var makeOption = function makeOption(props, index) {
         var slot = props.slot;
         return h("ElOption", helper([{}, {
           "props": props
@@ -959,6 +956,22 @@
         }]), [slot ? h("template", {
           "slot": props.slotName || 'default'
         }, [is.Function(slot) ? props.slot(h) : slot]) : null]);
+      };
+      var makeOptionGroup = function makeOptionGroup(props, index) {
+        return h("ElOptionGroup", {
+          "attrs": {
+            "label": props.label
+          },
+          "key": '' + index + '-' + props.label
+        }, [is.trueArray(props.options) && props.options.map(function (v, index) {
+          return makeOption(v, index);
+        })]);
+      };
+      var options = ctx.props.formCreateInject.options;
+      return h("ElSelect", helper([{}, ctx.data, {
+        "ref": "el"
+      }]), [(Array.isArray(options) ? options : []).map(function (props, index) {
+        return hasProperty(props || '', 'options') ? makeOptionGroup(props, index) : makeOption(props, index);
       }), ctx.children]);
     },
     mounted: function mounted() {
@@ -1504,9 +1517,6 @@
           n.forEach(function (val, i) {
             _this2.setValue(keys[i], n[i]);
           });
-          if (o.length && !n.length) {
-            this.input([]);
-          }
         }
       }
     },
@@ -1548,7 +1558,7 @@
           return;
         }
         this.cache(key, value);
-        $f.coverValue(value || {});
+        $f && $f.coverValue(value || {});
       },
       addRule: function addRule(i, emit) {
         var _this4 = this;
@@ -3580,7 +3590,8 @@
         vm: handle.vm,
         trueType: handle.getType(this.originType),
         vNode: handle.$render.vNode,
-        updated: false
+        updated: false,
+        cacheValue: this.rule.value
       });
       !init && this.unwatch();
       this.watchTo();
@@ -3823,6 +3834,7 @@
           ctx.root = rules;
           _this6.setCtx(ctx);
           !isCopy && !isInit && _this6.effect(ctx, 'load');
+          _this6.effect(ctx, 'created');
           ctx.parser.loadChildren === false || loadChildren(ctx.rule.children, ctx);
           if (!parent) {
             var _preIndex = preIndex(index);
@@ -4508,6 +4520,7 @@
             data.mergeProp = function (prop) {
               return mergeRule(data.getProp(), [prop]);
             };
+            data.id = ctx.id;
           }
           _this4.bus.$emit("p:".concat(attr, ":").concat(_type, ":").concat(p.input ? 1 : 0), event, [data, rule, _this4.api]);
         });
@@ -4521,9 +4534,12 @@
   }
   function getComponent(p) {
     var c = p.components;
-    if (Array.isArray(c)) return unique(c.filter(function (v) {
-      return v !== '*';
-    }));else if (is.String(c)) return [c];else return false;
+    if (Array.isArray(c)) {
+      var arr = unique(c.filter(function (v) {
+        return v !== '*';
+      }));
+      return arr.length ? arr : false;
+    } else if (is.String(c)) return [c];else return false;
   }
 
   function Handler(fc) {
@@ -4776,6 +4792,52 @@
     render: function render(children) {}
   });
 
+  var loadData = function loadData(fc) {
+    var loadData = {
+      name: 'loadData',
+      _fn: [],
+      created: function created(inject, rule, api) {
+        this.deleted(inject);
+        var attrs = toArray(inject.getValue());
+        var events = [];
+        attrs.forEach(function (attr) {
+          if (attr) {
+            var on = function on() {
+              if (attr.watch !== false) {
+                fc.bus.$off('p.loadData.' + attr.attr, on);
+                fc.bus.$once('p.loadData.' + attr.attr, on);
+              }
+              var value = undefined;
+              if (attr.attr) {
+                value = fc.loadData[attr.attr] || attr["default"];
+                if (attr.copy) {
+                  value = deepCopy(value);
+                }
+              }
+              deepSet(inject.getProp(), attr.to || 'options', value);
+              api.sync(rule);
+            };
+            events.push(function () {
+              return fc.bus.$off('p.loadData.' + attr.attr, on);
+            });
+            on();
+          }
+        });
+        this._fn[inject.id] = events;
+      },
+      deleted: function deleted(inject) {
+        if (this._fn[inject.id]) {
+          this._fn[inject.id].forEach(function (un) {
+            un();
+          });
+          delete this._fn[inject.id];
+        }
+        inject.clearProp();
+      }
+    };
+    loadData.watch = loadData.created;
+    return loadData;
+  };
   var componentValidate = {
     name: 'componentValidate',
     load: function load(attr, rule, api) {
@@ -4817,12 +4879,21 @@
     }
     function run(inject, rule, api) {
       var option = inject.value;
+      var set = function set(val) {
+        if (val === undefined) {
+          inject.clearProp();
+          api.sync(rule);
+        } else {
+          deepSet(inject.getProp(), option.to || 'options', val);
+        }
+      };
       if (is.Function(option)) {
         option = option(rule, api);
       }
       option = parseOpt(option);
       if (!option || !option.action) {
-        return false;
+        set(undefined);
+        return;
       }
       if (!option.to) {
         option.to = 'options';
@@ -4835,61 +4906,66 @@
           return true;
         }
       };
-      var set = function set(val) {
-        if (val === undefined) {
-          inject.clearProp();
+      var config = _objectSpread2(_objectSpread2({
+        headers: {}
+      }, option), {}, {
+        onSuccess: function onSuccess(body, flag) {
+          if (check()) return;
+          var fn = function fn(v) {
+            return flag ? v : v.data;
+          };
+          if (is.Function(option.parse)) {
+            fn = option.parse;
+          } else if (option.parse && is.String(option.parse)) {
+            fn = function fn(v) {
+              option.parse.split('.').forEach(function (k) {
+                if (v) {
+                  v = v[k];
+                }
+              });
+              return v;
+            };
+          }
+          set(fn(body, rule, api));
           api.sync(rule);
-        } else {
-          deepSet(inject.getProp(), option.to, val);
+        },
+        onError: function onError(e) {
+          set(undefined);
+          if (check()) return;
+          (_onError || function (e) {
+            return err(e.message || 'fetch fail ' + option.action);
+          })(e, rule, api);
         }
-      };
+      });
+      fc.options.beforeFetch && invoke(function () {
+        return fc.options.beforeFetch(config, {
+          rule: rule,
+          api: api
+        });
+      });
+      if (is.Function(option.action)) {
+        option.action(rule, api).then(function (val) {
+          config.onSuccess(val, true);
+        })["catch"](function (e) {
+          config.onError(e);
+        });
+        return;
+      }
       invoke(function () {
-        return fc.create.fetch(_objectSpread2(_objectSpread2({}, option), {}, {
-          onSuccess: function onSuccess(body) {
-            if (check()) return;
-            var fn = function fn(v) {
-              return v.data;
-            };
-            if (is.Function(option.parse)) {
-              fn = option.parse;
-            } else if (option.parse && is.String(option.parse)) {
-              fn = function fn(v) {
-                option.parse.split('.').forEach(function (k) {
-                  if (v) {
-                    v = v[k];
-                  }
-                });
-                return v;
-              };
-            }
-            set(fn(body, rule, api));
-            api.sync(rule);
-          },
-          onError: function onError(e) {
-            set(undefined);
-            if (check()) return;
-            (_onError || function (e) {
-              return err(e.message || 'fetch fail ' + option.action);
-            })(e, rule, api);
-          }
-        }), {
+        return fc.create.fetch(config, {
           inject: inject,
           rule: rule,
           api: api
         });
       });
-      return true;
     }
     return {
       name: 'fetch',
       loaded: function loaded() {
         run.apply(void 0, arguments);
       },
-      watch: function watch(inject, rule, api) {
-        if (!run(inject, rule, api)) {
-          inject.clearProp();
-          api.sync(rule);
-        }
+      watch: function watch() {
+        run.apply(void 0, arguments);
       }
     };
   };
@@ -4943,6 +5019,7 @@
   }
   var $provider = {
     fetch: fetch$1,
+    loadData: loadData,
     required: $required,
     componentValidate: componentValidate
   };
@@ -5025,13 +5102,18 @@
     var globalConfig = {
       global: {}
     };
-    var data = {};
+    var loadData = {};
     var CreateNode = CreateNodeFactory();
     exportAttrs(config.attrs || {});
     function getApi(name) {
       var val = instance[name];
-      if (Array.isArray(val)) return _toConsumableArray(val);
-      return val;
+      if (Array.isArray(val)) {
+        return val.map(function (v) {
+          return v.api();
+        });
+      } else if (val) {
+        return val.api();
+      }
     }
     function directive() {
       var data = nameProp.apply(void 0, arguments);
@@ -5073,6 +5155,22 @@
       components[name] = component;
       if (component.formCreateParser) parser(name, component.formCreateParser);
     }
+    function _emitData(id) {
+      Object.keys(instance).forEach(function (v) {
+        var apis = Array.isArray(instance[v]) ? instance[v] : [instance[v]];
+        apis.forEach(function (that) {
+          that.bus.$emit('p.loadData.' + id);
+        });
+      });
+    }
+    function setData(id, data) {
+      loadData[id] = data;
+      _emitData(id);
+    }
+    function removeData(id) {
+      delete loadData[id];
+      _emitData(id);
+    }
     function $form() {
       return _vue.extend($FormCreate(FormCreate));
     }
@@ -5099,7 +5197,7 @@
           directives: directives,
           providers: providers,
           maker: maker,
-          data: data
+          loadData: loadData
         };
       } else {
         delete _config.inherit;
@@ -5115,12 +5213,13 @@
         parsers: parsers,
         providers: providers,
         rules: Array.isArray(rules) ? rules : [],
-        name: vm.$options.propsData.name,
+        name: vm.$options.propsData.name || uniqueId(),
         inFor: vm.$options.propsData.inFor,
         prop: {
           components: components,
           directives: directives
         },
+        loadData: loadData,
         CreateNode: CreateNode,
         bus: new _vue(),
         unwatch: null,
@@ -5134,9 +5233,9 @@
       if (this.name) {
         if (this.inFor) {
           if (!instance[this.name]) instance[this.name] = [];
-          instance[this.name].push(this.api());
+          instance[this.name].push(this);
         } else {
-          instance[this.name] = this.api();
+          instance[this.name] = this;
         }
       }
     }
@@ -5171,8 +5270,11 @@
           h.reloadRule([]);
           if (_this2.name) {
             if (_this2.inFor) {
-              var idx = instance[_this2.name].indexOf(_this2.api());
+              var idx = instance[_this2.name].indexOf(_this2);
               instance[_this2.name].splice(idx, 1);
+              if (!instance[_this2.name].length) {
+                delete instance[_this2.name];
+              }
             } else {
               delete instance[_this2.name];
             }
@@ -5232,7 +5334,8 @@
       extend(formCreate, {
         version: config.version,
         ui: config.ui,
-        data: data,
+        setData: setData,
+        removeData: removeData,
         maker: maker,
         component: component,
         directive: directive,
@@ -5305,7 +5408,7 @@
       inherit.directives && extend(directives, inherit.directives);
       inherit.providers && extend(providers, inherit.providers);
       inherit.maker && extend(maker, inherit.maker);
-      inherit.data && extend(data, inherit.data);
+      inherit.loadData && extend(loadData, inherit.loadData);
     }
     return create;
   }
@@ -6036,7 +6139,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.32"),
+      version: "".concat("2.5.33"),
       manager: manager,
       extendApi: extendApi,
       install: install,