@form-create/element-ui 3.2.1 → 3.2.2

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.1
+ * @form-create/element-ui v3.2.2
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2101,6 +2101,7 @@ function $FormCreate(FormCreate, components, directives) {
         }
       },
       extendOption: Boolean,
+      driver: String,
       modelValue: Object,
       disabled: {
         type: Boolean,
@@ -2217,9 +2218,15 @@ function $FormCreate(FormCreate, components, directives) {
       var emit$form = debounce(function () {
         fc.bus.$emit('$loadData.$form');
       }, 100);
+
+      var emit$change = function emit$change(field) {
+        fc.bus.$emit('change-$form.' + field);
+      };
+
       onMounted(function () {
         if (parent) {
           fapi.top.bus.$on('$loadData.$form', emit$topForm);
+          fapi.top.bus.$on('change', emit$change);
         }
 
         fc.mounted();
@@ -2227,6 +2234,7 @@ function $FormCreate(FormCreate, components, directives) {
       onBeforeUnmount(function () {
         if (parent) {
           fapi.top.bus.$off('$loadData.$form', emit$topForm);
+          fapi.top.bus.$off('change', emit$change);
         }
 
         styleEl && document.head.removeChild(styleEl);
@@ -3442,6 +3450,9 @@ function Api(h) {
     setData: function setData(id, data) {
       return h.fc.setData(id, data);
     },
+    refreshData: function refreshData(id) {
+      return h.fc.refreshData(id);
+    },
     helper: {
       tidyFields: tidyFields,
       props: props
@@ -3803,7 +3814,7 @@ function useRender$1(Render) {
       return vn;
     },
     getModelField: function getModelField(ctx) {
-      return ctx.rule.modelField || ctx.parser.modelField || this.fc.modelFields[this.vNode.aliasMap[ctx.type]] || this.fc.modelFields[ctx.type] || this.fc.modelFields[ctx.originType] || 'modelValue';
+      return ctx.prop.modelField || ctx.parser.modelField || this.fc.modelFields[this.vNode.aliasMap[ctx.type]] || this.fc.modelFields[ctx.type] || this.fc.modelFields[ctx.originType] || 'modelValue';
     },
     isFragment: function isFragment(ctx) {
       return ctx.type === 'fragment' || ctx.type === 'template';
@@ -3937,10 +3948,18 @@ function useRender$1(Render) {
     },
     defaultRender: function defaultRender(ctx, children) {
       var prop = ctx.prop;
-      if (prop.component) return this.vNode.makeComponent(prop.component, prop, children);
+
+      if (prop.component) {
+        if (typeof prop.component === 'string') {
+          return this.vNode.make(prop.component, prop, children);
+        } else {
+          return this.vNode.makeComponent(prop.component, prop, children);
+        }
+      }
+
       if (this.vNode[ctx.type]) return this.vNode[ctx.type](prop, children);
       if (this.vNode[ctx.originType]) return this.vNode[ctx.originType](prop, children);
-      return this.vNode.make(lower(ctx.originType), prop, children);
+      return this.vNode.make(lower(prop.type), prop, children);
     },
     renderRule: function renderRule(rule, children, origin) {
       var _this9 = this;
@@ -4137,7 +4156,9 @@ function useInject(Handler) {
       var _this3 = this;
 
       if (str && typeof str === 'string' && str.indexOf('{{') > -1 && str.indexOf('}}') > -1) {
+        var tmp = str;
         var vars = extractVar(str);
+        var lastVal;
         vars.forEach(function (v) {
           var split = v.split('||');
           var field = split[0].trim();
@@ -4145,9 +4166,14 @@ function useInject(Handler) {
           if (field) {
             var def = (split[1] || '').trim();
             var val = get ? get(field, def) : _this3.fc.getLoadData(field, def);
+            lastVal = val;
             str = str.replaceAll("{{".concat(v, "}}"), val == null ? '' : val);
           }
         });
+
+        if (vars.length === 1 && tmp === "{{".concat(vars[0], "}}")) {
+          return lastVal;
+        }
       }
 
       return str;
@@ -5111,7 +5137,19 @@ function useInput(Handler) {
       var _this2 = this;
 
       var data = reactive({});
-      this.fields().reduce(function (initial, field) {
+      var fields = this.fields();
+
+      if (this.options.appendValue !== false) {
+        Object.keys(this.appendData).reduce(function (initial, field) {
+          if (fields.indexOf(field) === -1) {
+            initial[field] = toRef(_this2.appendData, field);
+          }
+
+          return initial;
+        }, data);
+      }
+
+      fields.reduce(function (initial, field) {
         var ctx = _this2.getCtx(field);
 
         initial[field] = toRef(ctx.rule, 'value');
@@ -5152,7 +5190,7 @@ function useInput(Handler) {
         return this.deferSyncFn.sync = true;
       }
 
-      this.vm.setupState.updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue !== false ? this.appendData : {}), this.form));
+      this.vm.setupState.updateValue(_objectSpread2({}, this.form));
     },
     isChange: function isChange(ctx, value) {
       return JSON.stringify(this.getFormData(ctx), strFn) !== JSON.stringify(value, strFn);
@@ -5224,9 +5262,17 @@ var BaseParser = {
   },
   mounted: function mounted(ctx) {},
   render: function render(children, ctx) {
+    if (ctx.$handle.fc.renderDriver && ctx.$handle.fc.renderDriver.defaultRender) {
+      return ctx.$handle.fc.renderDriver.defaultRender(ctx, children);
+    }
+
     return ctx.$render.defaultRender(ctx, children);
   },
   preview: function preview(children, ctx) {
+    if (ctx.$handle.fc.renderDriver && ctx.$handle.fc.renderDriver.defaultPreview) {
+      return ctx.$handle.fc.renderDriver.defaultPreview(ctx, children);
+    }
+
     return this.render(children, ctx);
   },
   mergeProp: function mergeProp(ctx) {}
@@ -5285,6 +5331,18 @@ function useContext(Handler) {
     },
     getParser: function getParser(ctx) {
       var list = this.fc.parsers;
+      var renderDriver = this.fc.renderDriver;
+
+      if (renderDriver) {
+        var _list = renderDriver.parsers || {};
+
+        var parser = _list[ctx.originType] || _list[toCase(ctx.type)] || _list[ctx.trueType];
+
+        if (parser) {
+          return parser;
+        }
+      }
+
       return list[ctx.originType] || list[toCase(ctx.type)] || list[ctx.trueType] || BaseParser;
     },
     bindParser: function bindParser(ctx) {
@@ -5482,7 +5540,7 @@ function useContext(Handler) {
 
       this.deferSyncValue(function () {
         o && o.forEach(function (child) {
-          if ((n || []).indexOf(child) === -1 && child && !is.String(child) && child.__fc__ && child.__fc__.parent === ctx && child.__fc__.root !== n) {
+          if ((n || []).indexOf(child) === -1 && child && !is.String(child) && child.__fc__ && child.__fc__.parent === ctx) {
             _this2.rmCtx(child.__fc__);
           }
         });
@@ -6033,6 +6091,17 @@ extend(Manager.prototype, {
     }), opt, this.mergeOptionsRule);
   },
   updateOptions: function updateOptions(options) {
+    var _this3 = this;
+
+    if (this.$handle.fc.renderDriver && this.$handle.fc.renderDriver.updateOptions) {
+      invoke(function () {
+        _this3.$handle.fc.renderDriver.updateOptions(options, {
+          handle: _this3.$handle,
+          api: _this3.$handle.api
+        });
+      });
+    }
+
     this.options = this.mergeOptions([options], this.getDefaultOptions());
     this.update();
   },
@@ -6070,7 +6139,18 @@ var loadData = function loadData(fc) {
               value = deepCopy(value);
             }
 
-            deepSet(inject.getProp(), attr.to || 'options', value);
+            var _rule = attr.modify ? rule : inject.getProp();
+
+            if (attr.to === 'child') {
+              if (_rule.children) {
+                _rule.children[0] = value;
+              } else {
+                _rule.children = [value];
+              }
+            } else {
+              deepSet(_rule, attr.to || 'options', value);
+            }
+
             api.sync(rule);
           }, attr.wait || 300));
 
@@ -6199,7 +6279,11 @@ var fetch = function fetch(fc) {
       }
     };
 
-    fetchAttr._fn[inject.id] = fc.watchLoadData(debounce(function (get) {
+    fetchAttr._fn[inject.id] = fc.watchLoadData(debounce(function (get, change) {
+      if (change && option.watch === false) {
+        return fetchAttr._fn[inject.id]();
+      }
+
       var _option = fc.$handle.loadFetchVar(deepCopy(option), get);
 
       var config = _objectSpread2(_objectSpread2({
@@ -6257,7 +6341,7 @@ var fetch = function fetch(fc) {
           });
         });
       });
-    }, option.wait || 1000));
+    }, option.wait || 600));
   }
 
   var fetchAttr = {
@@ -6409,6 +6493,7 @@ function FormCreateFactory(config) {
   var parsers = {};
   var directives = {};
   var modelFields = {};
+  var drivers = {};
   var useApps = [];
   var listener = [];
   var extendApiFn = [config.extendApi];
@@ -6567,18 +6652,31 @@ function FormCreateFactory(config) {
     formulas[name] = fn;
   }
 
-  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('$loadData.' + id);
+  function setDriver(name, driver) {
+    if (driver.parsers) {
+      Object.keys(driver.parsers).forEach(function (k) {
+        driver.parsers[k] = setPrototypeOf(driver.parsers[k], BaseParser);
       });
-    });
+    }
+
+    driver.name = name;
+    drivers[name] = driver;
+  }
+
+  function refreshData(id) {
+    if (id) {
+      Object.keys(instance).forEach(function (v) {
+        var apis = Array.isArray(instance[v]) ? instance[v] : [instance[v]];
+        apis.forEach(function (that) {
+          that.bus.$emit('$loadData.' + id);
+        });
+      });
+    }
   }
 
   function setData(id, data) {
     loadData[id] = data;
-    emitData(id);
+    refreshData(id);
   }
 
   function setDataDriver(id, data) {
@@ -6622,7 +6720,7 @@ function FormCreateFactory(config) {
 
   function removeData(id) {
     delete loadData[id];
-    emitData(id);
+    refreshData(id);
   }
 
   function on(name, callback) {
@@ -6652,13 +6750,15 @@ function FormCreateFactory(config) {
         components: components,
         directives: directives
       },
+      drivers: drivers,
+      renderDriver: null,
       setData: setData,
       getData: getData,
-      emitData: emitData,
+      refreshData: refreshData,
       loadData: loadData,
       CreateNode: CreateNode,
       bus: new Mitt(),
-      unwatch: null,
+      unwatch: [],
       options: ref({}),
       extendApiFn: extendApiFn,
       fetchCache: new WeakMap()
@@ -6695,7 +6795,7 @@ function FormCreateFactory(config) {
       var _this2 = this;
 
       if (this.isSub()) {
-        this.unwatch = watch(function () {
+        this.unwatch.push(watch(function () {
           return _this2.vm.setupState.parent.setupState.fc.options.value;
         }, function () {
           _this2.initOptions();
@@ -6703,9 +6803,11 @@ function FormCreateFactory(config) {
           _this2.$handle.api.refresh();
         }, {
           deep: true
-        });
+        }));
       }
 
+      var driver = this.vm.setupState.parent ? this.vm.setupState.parent.setupState.fc.renderDriver : this.vm.props.driver;
+      this.renderDriver = this.drivers[driver];
       this.initOptions();
       this.$handle.init();
     },
@@ -6752,13 +6854,26 @@ function FormCreateFactory(config) {
                 _this3.fetchCache.set(option, res);
               }
 
-              _this3.bus.$emit('$loadData.$globalData');
+              _this3.bus.$emit('$loadData.$globalData.' + key);
             } else {
               _this3.fetchCache["delete"](option);
             }
-          }, option.wait || 1000);
+          }, option.wait || 600);
+
+          var _emit = function _emit(data) {
+            _this3.fetchCache.set(option, {
+              status: true,
+              data: data
+            });
+
+            _this3.bus.$emit('$loadData.$globalData.' + key);
+          };
 
           var callback = function callback(get, change) {
+            if (change && option.watch === false) {
+              return unwatch();
+            }
+
             if (change) {
               reload();
               return;
@@ -6767,16 +6882,42 @@ function FormCreateFactory(config) {
             var options = _this3.$handle.loadFetchVar(copy$1(option), get);
 
             _this3.$handle.api.fetch(options).then(function (res) {
-              _this3.fetchCache.set(option, {
-                status: true,
-                data: res
-              });
-
-              _this3.bus.$emit('$loadData.$globalData');
+              _emit(res);
+            })["catch"](function (e) {
+              _emit(null);
             });
           };
 
           var unwatch = this.watchLoadData(callback);
+          this.unwatch.push(unwatch);
+          return val;
+        }
+      }
+    },
+    globalVarDriver: function globalVarDriver(id) {
+      var _this4 = this;
+
+      var split = id.split('.');
+      var key = split.shift();
+      var option = this.options.value.globalVariable && this.options.value.globalVariable[key];
+
+      if (option) {
+        var handle = is.Function(option) ? option : option.handle;
+
+        if (handle) {
+          var val;
+          var unwatch = this.watchLoadData(function (get, change) {
+            if (change) {
+              unwatch();
+
+              _this4.bus.$emit('$loadData.$var.' + key);
+            }
+
+            val = invoke(function () {
+              return handle(get, _this4.$handle.api);
+            });
+          });
+          this.unwatch.push(unwatch);
           return val;
         }
       }
@@ -6797,6 +6938,9 @@ function FormCreateFactory(config) {
         } else if (key === '$globalData') {
           val = this.globalDataDriver(split.join('.'));
           split = [];
+        } else if (key === '$var') {
+          val = this.globalVarDriver(split.join('.'));
+          split = [];
         } else {
           val = getData(id, def);
           split = [];
@@ -6807,11 +6951,10 @@ function FormCreateFactory(config) {
         }
       }
 
-      console.log(id, val);
       return val == null || val === '' ? def : val;
     },
     watchLoadData: function watchLoadData(fn) {
-      var _this4 = this;
+      var _this5 = this;
 
       var unwatch = {};
 
@@ -6826,13 +6969,14 @@ function FormCreateFactory(config) {
           return unwatch[id].val;
         }
 
-        var val = _this4.getLoadData(id, def);
-
-        var key = id.split('.').shift();
+        var val = _this5.getLoadData(id, def);
 
-        var callback = function callback() {
+        var split = id.split('.');
+        var key = split.shift();
+        var key2 = split.shift() || '';
+        var callback = debounce(function () {
           if (key !== id) {
-            var temp = _this4.getLoadData(id, def);
+            var temp = _this5.getLoadData(id, def);
 
             if (JSON.stringify(temp) !== JSON.stringify(unwatch[id].val)) {
               unwatch[id].val = temp;
@@ -6841,13 +6985,21 @@ function FormCreateFactory(config) {
           } else {
             run(true);
           }
-        };
+        }, 0);
 
-        _this4.bus.$on('$loadData.' + key, callback);
+        _this5.bus.$on('$loadData.' + key, callback);
+
+        if (key2) {
+          _this5.bus.$on('$loadData.' + key + '.' + key2, callback);
+        }
 
         unwatch[id] = {
           fn: function fn() {
-            _this4.bus.$off('$loadData.' + key, callback);
+            _this5.bus.$off('$loadData.' + key, callback);
+
+            if (key2) {
+              _this5.bus.$off('$loadData.' + key + '.' + key2, callback);
+            }
           },
           val: val
         };
@@ -6855,12 +7007,16 @@ function FormCreateFactory(config) {
       };
 
       run(false);
-      return function () {
+
+      var un = function un() {
         Object.keys(unwatch).forEach(function (k) {
           return unwatch[k].fn();
         });
         unwatch = {};
       };
+
+      this.unwatch.push(un);
+      return un;
     },
     isSub: function isSub() {
       return this.vm.setupState.parent && this.vm.props.extendOption;
@@ -6912,7 +7068,7 @@ function FormCreateFactory(config) {
       this.$handle.mounted();
     },
     unmount: function unmount() {
-      var _this5 = this;
+      var _this6 = this;
 
       if (this.name) {
         if (this.inFor) {
@@ -6924,16 +7080,19 @@ function FormCreateFactory(config) {
       }
 
       listener.forEach(function (item) {
-        _this5.bus.$off(item.name, item.callback);
+        _this6.bus.$off(item.name, item.callback);
       });
-      this.unwatch && this.unwatch();
+      this.unwatch.forEach(function (fn) {
+        return fn();
+      });
+      this.unwatch = [];
       this.$handle.reloadRule([]);
     },
     updated: function updated() {
-      var _this6 = this;
+      var _this7 = this;
 
       this.$handle.bindNextTick(function () {
-        return _this6.bus.$emit('next-tick', _this6.$handle.api);
+        return _this7.bus.$emit('next-tick', _this7.$handle.api);
       });
     }
   });
@@ -6947,11 +7106,13 @@ function FormCreateFactory(config) {
       setDataDriver: setDataDriver,
       setData: setData,
       removeData: removeData,
+      refreshData: refreshData,
       maker: maker,
       component: component,
       directive: directive,
       setModelField: setModelField,
       setFormula: setFormula,
+      setDriver: setDriver,
       register: register,
       $vnode: $vnode,
       parser: parser,
@@ -7913,7 +8074,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.1',
+    version: '3.2.2',
     manager: manager,
     extendApi: extendApi,
     install: install,