@form-create/iview 2.5.35 → 2.5.36

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/iview v2.5.35
+ * @form-create/iview v2.5.36
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1927,7 +1927,10 @@
           }
         },
         extendOption: Boolean,
-        disabled: Boolean,
+        disabled: {
+          type: Boolean,
+          "default": undefined
+        },
         value: Object,
         api: Object,
         name: String,
@@ -1990,8 +1993,8 @@
           this.formCreate.$handle.reloadRule(n);
           this._renderRule();
         },
-        disabled: function disabled(n) {
-          this.$f.disabled(!!n);
+        disabled: function disabled() {
+          this.$f.refresh();
         }
       },
       beforeCreate: function beforeCreate() {
@@ -2136,7 +2139,7 @@
   var $TX = '$FNX:';
   var FUNCTION = 'function';
   function toJson(obj, space) {
-    return JSON.stringify(deepExtend([], obj, true), function (key, val) {
+    return JSON.stringify(deepExtend(Array.isArray(obj) ? [] : {}, obj, true), function (key, val) {
       if (val && val._isVue === true) return undefined;
       if (_typeof(val) !== FUNCTION) {
         return val;
@@ -2247,6 +2250,61 @@
     }
     return def;
   }
+  var changeType = function changeType(a, b) {
+    if (typeof a === 'string') {
+      return String(b);
+    } else if (typeof a === 'number') {
+      return Number(b);
+    }
+    return b;
+  };
+  var condition = {
+    '==': function _(a, b) {
+      return JSON.stringify(a) === JSON.stringify(changeType(a, b));
+    },
+    '!=': function _(a, b) {
+      return !condition['=='](a, b);
+    },
+    '>': function _(a, b) {
+      return a > b;
+    },
+    '>=': function _(a, b) {
+      return a >= b;
+    },
+    '<': function _(a, b) {
+      return a < b;
+    },
+    '<=': function _(a, b) {
+      return a <= b;
+    },
+    on: function on(a, b) {
+      return a && a.indexOf && a.indexOf(changeType(a[0], b)) > -1;
+    },
+    notOn: function notOn(a, b) {
+      return !condition.on(a, b);
+    },
+    "in": function _in(a, b) {
+      return b && b.indexOf && b.indexOf(a) > -1;
+    },
+    notIn: function notIn(a, b) {
+      return !condition["in"](a, b);
+    },
+    between: function between(a, b) {
+      return a > b[0] && a < b[1];
+    },
+    notBetween: function notBetween(a, b) {
+      return a < b[0] || a > b[1];
+    },
+    empty: function empty(a) {
+      return is.empty(a);
+    },
+    notEmpty: function notEmpty(a) {
+      return !is.empty(a);
+    },
+    pattern: function pattern(a, b) {
+      return new RegExp(b, 'g').test(a);
+    }
+  };
 
   function baseRule() {
     return {
@@ -2328,6 +2386,92 @@
     };
   }
 
+  function getError(action, option, xhr) {
+    var msg = "fail to ".concat(action, " ").concat(xhr.status, "'");
+    var err = new Error(msg);
+    err.status = xhr.status;
+    err.url = action;
+    return err;
+  }
+  function getBody(xhr) {
+    var text = xhr.responseText || xhr.response;
+    if (!text) {
+      return text;
+    }
+    try {
+      return JSON.parse(text);
+    } catch (e) {
+      return text;
+    }
+  }
+  function fetch(option) {
+    if (typeof XMLHttpRequest === 'undefined') {
+      return;
+    }
+    var xhr = new XMLHttpRequest();
+    var action = option.action;
+    xhr.onerror = function error(e) {
+      option.onError(e);
+    };
+    xhr.onload = function onload() {
+      if (xhr.status < 200 || xhr.status >= 300) {
+        return option.onError(getError(action, option, xhr), getBody(xhr));
+      }
+      option.onSuccess(getBody(xhr));
+    };
+    xhr.open(option.method || 'get', action, true);
+    var formData;
+    if (option.data) {
+      if ((option.dataType || '').toLowerCase() !== 'json') {
+        formData = new FormData();
+        Object.keys(option.data).map(function (key) {
+          formData.append(key, option.data[key]);
+        });
+      } else {
+        formData = JSON.stringify(option.data);
+        xhr.setRequestHeader('content-type', 'application/json');
+      }
+    }
+    if (option.withCredentials && 'withCredentials' in xhr) {
+      xhr.withCredentials = true;
+    }
+    var headers = option.headers || {};
+    Object.keys(headers).forEach(function (item) {
+      if (headers[item] !== null) {
+        xhr.setRequestHeader(item, headers[item]);
+      }
+    });
+    xhr.send(formData);
+  }
+  function asyncFetch(config) {
+    return new Promise(function (resolve, reject) {
+      fetch(_objectSpread2(_objectSpread2({}, config), {}, {
+        onSuccess: function onSuccess(res) {
+          var fn = function fn(v) {
+            return v;
+          };
+          var parse = parseFn(config.parse);
+          if (is.Function(parse)) {
+            fn = parse;
+          } else if (parse && is.String(parse)) {
+            fn = function fn(v) {
+              parse.split('.').forEach(function (k) {
+                if (v) {
+                  v = v[k];
+                }
+              });
+              return v;
+            };
+          }
+          resolve(fn(res));
+        },
+        onError: function onError(err) {
+          reject(err);
+        }
+      }));
+    });
+  }
+
   function copy(value) {
     return deepCopy(value);
   }
@@ -2609,6 +2753,21 @@
           return origin ? ctx.origin : ctx.rule;
         }
       },
+      getRenderRule: function getRenderRule(id) {
+        var ctx = h.getCtx(id);
+        if (ctx) {
+          return ctx.prop;
+        }
+      },
+      getRefRule: function getRefRule(id) {
+        var ctxs = h.getCtxs(id);
+        if (ctxs && ctxs.length) {
+          var rules = ctxs.map(function (ctx) {
+            return ctx.rule;
+          });
+          return rules.length === 1 ? rules[0] : rules;
+        }
+      },
       setEffect: function setEffect(id, attr, value) {
         var ctx = h.getCtx(id);
         if (ctx && attr) {
@@ -2715,12 +2874,23 @@
       deferSyncValue: function deferSyncValue(fn, sync) {
         h.deferSyncValue(fn, sync);
       },
+      fetch: function fetch(opt) {
+        h.options.beforeFetch && invoke(function () {
+          return h.options.beforeFetch(opt, {
+            api: api
+          });
+        });
+        return asyncFetch(opt);
+      },
+      getData: function getData(id, def) {
+        return hasProperty(h.fc.loadData, id) ? h.fc.loadData[id] : def;
+      },
       helper: {
         tidyFields: tidyFields,
         props: props
       }
     };
-    ['on', 'once', 'off', 'set'].forEach(function (n) {
+    ['on', 'once', 'off', 'set', 'emit'].forEach(function (n) {
       api[n] = function () {
         var _h$vm2;
         (_h$vm2 = h.vm)["$".concat(n)].apply(_h$vm2, arguments);
@@ -3106,6 +3276,7 @@
             children: [],
             prop: {},
             preview: false,
+            id: ctx.id,
             field: ctx.field,
             rule: ctx.rule,
             input: ctx.input
@@ -3125,13 +3296,13 @@
         });
         return inject;
       },
-      ctxProp: function ctxProp(ctx, custom) {
+      ctxProp: function ctxProp(ctx) {
         var _this8 = this;
         var ref = ctx.ref,
             key = ctx.key,
             rule = ctx.rule;
-        this.$manager.mergeProp(ctx, custom);
-        ctx.parser.mergeProp(ctx, custom);
+        this.$manager.mergeProp(ctx);
+        ctx.parser.mergeProp(ctx);
         var props = [{
           ref: ref,
           key: rule.key || "".concat(key, "fc"),
@@ -3151,7 +3322,10 @@
             }
           }
         }];
-        if (!custom && ctx.input) {
+        if (ctx.input) {
+          if (this.vm.$props.disabled !== undefined) {
+            ctx.prop.props.disabled = !!this.vm.$props.disabled;
+          }
           ctx.prop.model = {
             value: this.$handle.getFormData(ctx),
             callback: function callback(value) {
@@ -3309,16 +3483,17 @@
             inject = rule.inject;
         var emit = rule[on ? 'emit' : 'nativeEmit'] || [];
         if (is.trueArray(emit)) {
-          var emitKey = emitPrefix || field || name;
-          if (emitKey) {
-            if (!on) emitKey = "native-".concat(emitKey);
-            emit.forEach(function (eventName) {
-              if (!eventName) return;
-              var eventInject;
-              if (is.Object(eventName)) {
-                eventInject = eventName.inject;
-                eventName = eventName.name;
-              }
+          emit.forEach(function (eventName) {
+            if (!eventName) return;
+            var eventInject;
+            var emitKey = emitPrefix || field || name;
+            if (is.Object(eventName)) {
+              eventInject = eventName.inject;
+              eventName = eventName.name;
+              emitKey = eventName.prefix || emitKey;
+            }
+            if (emitKey) {
+              if (!on) emitKey = "native-".concat(emitKey);
               var fieldKey = toLine("".concat(emitKey, "-").concat(eventName));
               var fn = function fn() {
                 var _this2$vm, _this2$vm2;
@@ -3335,8 +3510,8 @@
                 var _inject = eventInject || inject || _this2.options.injectEvent;
                 event[eventName] = is.Undef(_inject) ? fn : _this2.inject(rule, fn, _inject);
               }
-            });
-          }
+            }
+          });
         }
         ctx.computed[on ? 'on' : 'nativeOn'] = event;
         return event;
@@ -3512,6 +3687,30 @@
         return _this.payload[k];
       })), [this.computed]));
     },
+    injectValidate: function injectValidate() {
+      var _this2 = this;
+      return toArray(this.prop.validate).map(function (item) {
+        if (is.Function(item.validator)) {
+          var temp = _objectSpread2({}, item);
+          var that = _this2;
+          temp.validator = function () {
+            var _item$validator;
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+            return (_item$validator = item.validator).call.apply(_item$validator, [{
+              that: this,
+              id: that.id,
+              field: that.field,
+              rule: that.rule,
+              api: that.$handle.api
+            }].concat(args));
+          };
+          return temp;
+        }
+        return item;
+      });
+    },
     check: function check(handle) {
       return this.vm === handle.vm;
     },
@@ -3560,12 +3759,12 @@
       this.ctrlRule = [];
     },
     rm: function rm() {
-      var _this2 = this;
+      var _this3 = this;
       var _rm = function _rm() {
-        var index = _this2.root.indexOf(_this2.origin);
+        var index = _this3.root.indexOf(_this3.origin);
         if (index > -1) {
-          _this2.root.splice(index, 1);
-          _this2.$handle && _this2.$handle.refresh();
+          _this3.root.splice(index, 1);
+          _this3.$handle && _this3.$handle.refresh();
         }
       };
       if (this.deleted) {
@@ -3573,14 +3772,14 @@
         return;
       }
       this.$handle.noWatch(function () {
-        _this2.$handle.deferSyncValue(function () {
-          _this2.rmCtrl();
+        _this3.$handle.deferSyncValue(function () {
+          _this3.rmCtrl();
           _rm();
-          _this2.$handle.rmCtx(_this2);
-          extend(_this2, {
+          _this3.$handle.rmCtx(_this3);
+          extend(_this3, {
             root: []
           });
-        }, _this2.input);
+        }, _this3.input);
       });
     },
     update: function update(handle, init) {
@@ -3601,73 +3800,6 @@
     }
   });
 
-  var condition = {
-    '==': function _(b) {
-      return function (a) {
-        return a === b;
-      };
-    },
-    '!=': function _(b) {
-      return function (a) {
-        return a !== b;
-      };
-    },
-    '<>': function _(b) {
-      return function (a) {
-        return a !== b;
-      };
-    },
-    '>': function _(b) {
-      return function (a) {
-        return a > b;
-      };
-    },
-    '>=': function _(b) {
-      return function (a) {
-        return a >= b;
-      };
-    },
-    '<': function _(b) {
-      return function (a) {
-        return a < b;
-      };
-    },
-    '<=': function _(b) {
-      return function (a) {
-        return a <= b;
-      };
-    },
-    'in': function _in(b) {
-      return function (a) {
-        return b && b.indexOf && b.indexOf(a) > -1;
-      };
-    },
-    'on': function on(b) {
-      return function (a) {
-        return a && a.indexOf && a.indexOf(b) > -1;
-      };
-    },
-    'notIn': function notIn(b) {
-      return function (a) {
-        return !condition["in"](b)(a);
-      };
-    },
-    'notOn': function notOn(b) {
-      return function (a) {
-        return !condition.on(b)(a);
-      };
-    },
-    'between': function between(b) {
-      return function (a) {
-        return a > b[0] && a < b[1];
-      };
-    },
-    'notBetween': function notBetween(b) {
-      return function (a) {
-        return a < b[0] || a > b[1];
-      };
-    }
-  };
   function useLoader(Handler) {
     extend(Handler.prototype, {
       nextRefresh: function nextRefresh(fn) {
@@ -3819,7 +3951,7 @@
           }
           if (!ctx) {
             var _rule2 = _this6.parseRule(_rule);
-            ctx = new RuleContext(_this6, _rule2, isInit ? defaultValue : _rule2.value);
+            ctx = new RuleContext(_this6, _rule2, defaultValue);
             _this6.bindParser(ctx);
           } else {
             if (ctx.originType !== ctx.rule.type) {
@@ -3872,7 +4004,9 @@
         if (!controls.length) return false;
         var _loop = function _loop(i) {
           var control = controls[i],
-              handleFn = control.handle || (condition[control.condition || '=='] || condition['=='])(control.value);
+              handleFn = control.handle || function (val) {
+            return (condition[control.condition || '=='] || condition['=='])(val, control.value);
+          };
           if (!is.trueArray(control.rule)) return "continue";
           var data = _objectSpread2(_objectSpread2({}, control), {}, {
             valid: invoke(function () {
@@ -4034,6 +4168,11 @@
         this.valueChange(ctx, value);
         this.vm.$emit('change', ctx.field, value, ctx.origin, this.api, setFlag || false);
         this.effect(ctx, 'value');
+        this.emitEvent('change', ctx.field, value, {
+          rule: ctx.origin,
+          api: this.api,
+          setFlag: setFlag || false
+        });
       },
       onInput: function onInput(ctx, value) {
         var val;
@@ -4130,12 +4269,13 @@
       isQuote: function isQuote(ctx, value) {
         return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
       },
-      refreshUpdate: function refreshUpdate(ctx, val, origin) {
+      refreshUpdate: function refreshUpdate(ctx, val, origin, field) {
         var _this4 = this;
         if (is.Function(ctx.rule.update)) {
           var state = invoke(function () {
             return ctx.rule.update(val, ctx.origin, _this4.api, {
-              origin: origin || 'change'
+              origin: origin || 'change',
+              linkField: field
             });
           });
           if (state === undefined) return;
@@ -4146,21 +4286,21 @@
         this.refreshRule(ctx, val);
         this.bus.$emit('change-' + ctx.field, val);
       },
-      refreshRule: function refreshRule(ctx, val, origin) {
+      refreshRule: function refreshRule(ctx, val, origin, field) {
         if (this.refreshControl(ctx)) {
           this.$render.clearCacheAll();
           this.loadRule();
           this.vm.$emit('update', this.api);
           this.refresh();
         }
-        this.refreshUpdate(ctx, val, origin);
+        this.refreshUpdate(ctx, val, origin, field);
       },
       appendLink: function appendLink(ctx) {
         var _this5 = this;
         var link = ctx.rule.link;
         is.trueArray(link) && link.forEach(function (field) {
           var fn = function fn() {
-            return _this5.refreshRule(ctx, ctx.rule.value, 'link');
+            return _this5.refreshRule(ctx, ctx.rule.value, 'link', field);
           };
           _this5.bus.$on('change-' + field, fn);
           ctx.linkOn.push(function () {
@@ -4391,12 +4531,22 @@
         }
       },
       lifecycle: function lifecycle(name) {
-        var _this2 = this;
-        var fn = this.options[name];
-        is.Function(fn) && invoke(function () {
-          return fn(_this2.api);
-        });
         this.vm.$emit(name, this.api);
+        this.emitEvent(name, this.api);
+      },
+      emitEvent: function emitEvent(name) {
+        var _this$bus;
+        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = arguments[_key];
+        }
+        var _fn = this.options[name] || this.options[toCase('on-' + name)];
+        if (_fn) {
+          var fn = parseFn(_fn);
+          is.Function(fn) && invoke(function () {
+            return fn.apply(void 0, args);
+          });
+        }
+        (_this$bus = this.bus).$emit.apply(_this$bus, [name].concat(args));
       }
     });
   }
@@ -4598,6 +4748,7 @@
       this.usePage();
       this.loadRule();
       this.$manager.__init();
+      this.lifecycle('created');
       this.vm.$set(this.vm, 'formData', this.formData);
     }
   });
@@ -4610,64 +4761,6 @@
   useLifecycle(Handler);
   useEffect(Handler);
 
-  function getError(action, option, xhr) {
-    var msg = "fail to ".concat(action, " ").concat(xhr.status, "'");
-    var err = new Error(msg);
-    err.status = xhr.status;
-    err.url = action;
-    return err;
-  }
-  function getBody(xhr) {
-    var text = xhr.responseText || xhr.response;
-    if (!text) {
-      return text;
-    }
-    try {
-      return JSON.parse(text);
-    } catch (e) {
-      return text;
-    }
-  }
-  function fetch(option) {
-    if (typeof XMLHttpRequest === 'undefined') {
-      return;
-    }
-    var xhr = new XMLHttpRequest();
-    var action = option.action;
-    xhr.onerror = function error(e) {
-      option.onError(e);
-    };
-    xhr.onload = function onload() {
-      if (xhr.status < 200 || xhr.status >= 300) {
-        return option.onError(getError(action, option, xhr), getBody(xhr));
-      }
-      option.onSuccess(getBody(xhr));
-    };
-    xhr.open(option.method || 'get', action, true);
-    var formData;
-    if (option.data) {
-      if ((option.dataType || '').toLowerCase() !== 'json') {
-        formData = new FormData();
-        Object.keys(option.data).map(function (key) {
-          formData.append(key, option.data[key]);
-        });
-      } else {
-        formData = JSON.stringify(option.data);
-        xhr.setRequestHeader('content-type', 'application/json');
-      }
-    }
-    if (option.withCredentials && 'withCredentials' in xhr) {
-      xhr.withCredentials = true;
-    }
-    var headers = option.headers || {};
-    Object.keys(headers).forEach(function (item) {
-      if (headers[item] !== null) {
-        xhr.setRequestHeader(item, headers[item]);
-      }
-    });
-    xhr.send(formData);
-  }
-
   var NAME$9 = 'fcFragment';
   var fragment = {
     name: NAME$9,
@@ -4910,6 +5003,7 @@
         set(undefined);
         return;
       }
+      option = deepCopy(option);
       if (!option.to) {
         option.to = 'options';
       }
@@ -4990,6 +5084,7 @@
       var val = parseVal(inject.getValue());
       if (val.required === false) {
         inject.clearProp();
+        api.clearValidateState([rule.field]);
       } else {
         var validate = _objectSpread2({
           required: true,
@@ -5168,9 +5263,13 @@
         component = id;
       }
       if (!name || !component) return;
+      var nameAlias = toCase(name);
       components[name] = component;
+      components[nameAlias] = component;
       delete CreateNode.aliasMap[name];
+      delete CreateNode.aliasMap[nameAlias];
       delete parsers[name];
+      delete parsers[nameAlias];
       if (component.formCreateParser) parser(name, component.formCreateParser);
     }
     function _emitData(id) {
@@ -5279,7 +5378,6 @@
             _this2.initOptions();
           }
           _this2.created();
-          vm.disabled && vm.$f.disabled(true);
         });
         vm.$on('hook:mounted', function () {
           _this2.mounted();
@@ -5777,8 +5875,7 @@
         ref: ref
       });
       extend(this.rule.props, {
-        model: $handle.formData,
-        rules: $handle.validate()
+        model: $handle.formData
       });
     },
     render: function render(children) {
@@ -5801,7 +5898,7 @@
           labelWidth: labelWidth
         }, rule.wrap || {}), {}, {
           prop: ctx.id,
-          rules: rule.validate
+          rules: ctx.injectValidate()
         }),
         "class": rule.className,
         key: "".concat(uni, "fi"),
@@ -6210,7 +6307,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.35"),
+      version: "".concat("2.5.36"),
       manager: manager,
       install: install,
       extendApi: extendApi,