@form-create/element-ui 3.1.24 → 3.1.25

package/dist/form-create.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.
@@ -1016,6 +1016,48 @@
     }
   });
 
+  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 = vue.defineComponent({
     name: NAME$6,
@@ -1047,6 +1089,26 @@
           _this$$slots$default,
           _this$$slots;
 
+      var makeOption = function makeOption(props, index) {
+        return vue.createVNode(vue.resolveComponent("ElOption"), vue.mergeProps(props, {
+          "key": '' + index + '-' + props.value
+        }), null);
+      };
+
+      var makeOptionGroup = function makeOptionGroup(props, index) {
+        return vue.createVNode(vue.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 vue.createVNode(vue.resolveComponent("ElSelect"), vue.mergeProps(this.$attrs, {
         "modelValue": this.value,
         "onUpdate:modelValue": function onUpdateModelValue(v) {
@@ -1055,10 +1117,8 @@
         "ref": "el"
       }), _objectSpread2({
         "default": function _default() {
-          return [_this.options().map(function (props, index) {
-            return vue.createVNode(vue.resolveComponent("ElOption"), vue.mergeProps(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'])));
@@ -1282,48 +1342,6 @@
     }
   });
 
-  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;
   }
@@ -3936,7 +3954,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();
@@ -5478,6 +5497,15 @@
     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);
       }
@@ -5485,7 +5513,8 @@
       option = parseOpt(option);
 
       if (!option || !option.action) {
-        return false;
+        set(undefined);
+        return;
       }
 
       if (!option.to) {
@@ -5502,55 +5531,65 @@
         }
       };
 
-      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 {
@@ -5558,11 +5597,8 @@
       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);
       }
     };
   };
@@ -6883,7 +6919,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.24',
+      version: '3.1.25',
       manager: manager,
       extendApi: extendApi,
       install: install,