@form-create/element-ui 3.1.24 → 3.1.25

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.24
+ * @form-create/element-ui v3.1.25
  * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1012,6 +1012,48 @@ var Radio = defineComponent({
   }
 });
 
+var is = {
+  type: function type(arg, _type) {
+    return Object.prototype.toString.call(arg) === '[object ' + _type + ']';
+  },
+  Undef: function Undef(v) {
+    return v === undefined || v === null;
+  },
+  Element: function Element(arg) {
+    return _typeof(arg) === 'object' && arg !== null && arg.nodeType === 1 && !is.Object(arg);
+  },
+  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', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
+  is[t] = function (arg) {
+    return is.type(arg, t);
+  };
+});
+function hasProperty(rule, k) {
+  return {}.hasOwnProperty.call(rule, k);
+}
+
 var NAME$6 = 'fcSelect';
 var Select = defineComponent({
   name: NAME$6,
@@ -1043,6 +1085,26 @@ var Select = defineComponent({
         _this$$slots$default,
         _this$$slots;
 
+    var makeOption = function makeOption(props, index) {
+      return createVNode(resolveComponent("ElOption"), mergeProps$1(props, {
+        "key": '' + index + '-' + props.value
+      }), null);
+    };
+
+    var makeOptionGroup = function makeOptionGroup(props, index) {
+      return createVNode(resolveComponent("ElOptionGroup"), {
+        "label": props.label,
+        "key": '' + index + '-' + props.label
+      }, {
+        "default": function _default() {
+          return [is.trueArray(props.options) && props.options.map(function (v, index) {
+            return makeOption(v, index);
+          })];
+        }
+      });
+    };
+
+    var options = this.options();
     return createVNode(resolveComponent("ElSelect"), mergeProps$1(this.$attrs, {
       "modelValue": this.value,
       "onUpdate:modelValue": function onUpdateModelValue(v) {
@@ -1051,10 +1113,8 @@ var Select = defineComponent({
       "ref": "el"
     }), _objectSpread2({
       "default": function _default() {
-        return [_this.options().map(function (props, index) {
-          return createVNode(resolveComponent("ElOption"), mergeProps$1(props, {
-            "key": '' + index + '-' + props.value
-          }), null);
+        return [options.map(function (props, index) {
+          return hasProperty(props || '', 'options') ? makeOptionGroup(props, index) : makeOption(props, index);
         }), (_this$$slots$default = (_this$$slots = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots)];
       }
     }, getSlot(this.$slots, ['default'])));
@@ -1278,48 +1338,6 @@ var Upload = defineComponent({
   }
 });
 
-var is = {
-  type: function type(arg, _type) {
-    return Object.prototype.toString.call(arg) === '[object ' + _type + ']';
-  },
-  Undef: function Undef(v) {
-    return v === undefined || v === null;
-  },
-  Element: function Element(arg) {
-    return _typeof(arg) === 'object' && arg !== null && arg.nodeType === 1 && !is.Object(arg);
-  },
-  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', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
-  is[t] = function (arg) {
-    return is.type(arg, t);
-  };
-});
-function hasProperty(rule, k) {
-  return {}.hasOwnProperty.call(rule, k);
-}
-
 function $set(target, field, value) {
   target[field] = value;
 }
@@ -3932,7 +3950,8 @@ extend(RuleContext.prototype, {
       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();
@@ -5474,6 +5493,15 @@ var fetch = function fetch(fc) {
   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);
     }
@@ -5481,7 +5509,8 @@ var fetch = function fetch(fc) {
     option = parseOpt(option);
 
     if (!option || !option.action) {
-      return false;
+      set(undefined);
+      return;
     }
 
     if (!option.to) {
@@ -5498,55 +5527,65 @@ var fetch = function fetch(fc) {
       }
     };
 
-    var set = function set(val) {
-      if (val === undefined) {
-        inject.clearProp();
-        api.sync(rule);
-      } else {
-        deepSet(inject.getProp(), option.to, val);
-      }
-    };
+    var config = _objectSpread2(_objectSpread2({
+      headers: {}
+    }, option), {}, {
+      onSuccess: function onSuccess(body, flag) {
+        if (check()) return;
 
-    invoke(function () {
-      return fc.create.fetch(_objectSpread2(_objectSpread2({}, option), {}, {
-        onSuccess: function onSuccess(body) {
-          if (check()) return;
+        var fn = function fn(v) {
+          return flag ? v : v.data;
+        };
 
-          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;
           };
+        }
 
-          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;
 
-          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);
+      }
+    });
 
-          (_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(config, {
         inject: inject,
         rule: rule,
         api: api
       });
     });
-    return true;
   }
 
   return {
@@ -5554,11 +5593,8 @@ var fetch = function fetch(fc) {
     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);
     }
   };
 };
@@ -6879,7 +6915,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.1.24',
+    version: '3.1.25',
     manager: manager,
     extendApi: extendApi,
     install: install,