@form-create/element-ui 3.2.1 → 3.2.2

package/dist/form-create.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.
@@ -2105,6 +2105,7 @@
           }
         },
         extendOption: Boolean,
+        driver: String,
         modelValue: Object,
         disabled: {
           type: Boolean,
@@ -2221,9 +2222,15 @@
         var emit$form = debounce(function () {
           fc.bus.$emit('$loadData.$form');
         }, 100);
+
+        var emit$change = function emit$change(field) {
+          fc.bus.$emit('change-$form.' + field);
+        };
+
         vue.onMounted(function () {
           if (parent) {
             fapi.top.bus.$on('$loadData.$form', emit$topForm);
+            fapi.top.bus.$on('change', emit$change);
           }
 
           fc.mounted();
@@ -2231,6 +2238,7 @@
         vue.onBeforeUnmount(function () {
           if (parent) {
             fapi.top.bus.$off('$loadData.$form', emit$topForm);
+            fapi.top.bus.$off('change', emit$change);
           }
 
           styleEl && document.head.removeChild(styleEl);
@@ -3446,6 +3454,9 @@
       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
@@ -3807,7 +3818,7 @@
         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';
@@ -3941,10 +3952,18 @@
       },
       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;
@@ -4141,7 +4160,9 @@
         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();
@@ -4149,9 +4170,14 @@
             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;
@@ -5115,7 +5141,19 @@
         var _this2 = this;
 
         var data = vue.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] = vue.toRef(_this2.appendData, field);
+            }
+
+            return initial;
+          }, data);
+        }
+
+        fields.reduce(function (initial, field) {
           var ctx = _this2.getCtx(field);
 
           initial[field] = vue.toRef(ctx.rule, 'value');
@@ -5156,7 +5194,7 @@
           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);
@@ -5228,9 +5266,17 @@
     },
     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) {}
@@ -5289,6 +5335,18 @@
       },
       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) {
@@ -5486,7 +5544,7 @@
 
         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__);
             }
           });
@@ -6037,6 +6095,17 @@
       }), 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();
     },
@@ -6074,7 +6143,18 @@
                 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));
 
@@ -6203,7 +6283,11 @@
         }
       };
 
-      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({
@@ -6261,7 +6345,7 @@
             });
           });
         });
-      }, option.wait || 1000));
+      }, option.wait || 600));
     }
 
     var fetchAttr = {
@@ -6413,6 +6497,7 @@
     var parsers = {};
     var directives = {};
     var modelFields = {};
+    var drivers = {};
     var useApps = [];
     var listener = [];
     var extendApiFn = [config.extendApi];
@@ -6571,18 +6656,31 @@
       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) {
@@ -6626,7 +6724,7 @@
 
     function removeData(id) {
       delete loadData[id];
-      emitData(id);
+      refreshData(id);
     }
 
     function on(name, callback) {
@@ -6656,13 +6754,15 @@
           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: vue.ref({}),
         extendApiFn: extendApiFn,
         fetchCache: new WeakMap()
@@ -6699,7 +6799,7 @@
         var _this2 = this;
 
         if (this.isSub()) {
-          this.unwatch = vue.watch(function () {
+          this.unwatch.push(vue.watch(function () {
             return _this2.vm.setupState.parent.setupState.fc.options.value;
           }, function () {
             _this2.initOptions();
@@ -6707,9 +6807,11 @@
             _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();
       },
@@ -6756,13 +6858,26 @@
                   _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;
@@ -6771,16 +6886,42 @@
               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;
           }
         }
@@ -6801,6 +6942,9 @@
           } 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 = [];
@@ -6811,11 +6955,10 @@
           }
         }
 
-        console.log(id, val);
         return val == null || val === '' ? def : val;
       },
       watchLoadData: function watchLoadData(fn) {
-        var _this4 = this;
+        var _this5 = this;
 
         var unwatch = {};
 
@@ -6830,13 +6973,14 @@
             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;
@@ -6845,13 +6989,21 @@
             } 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
           };
@@ -6859,12 +7011,16 @@
         };
 
         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;
@@ -6916,7 +7072,7 @@
         this.$handle.mounted();
       },
       unmount: function unmount() {
-        var _this5 = this;
+        var _this6 = this;
 
         if (this.name) {
           if (this.inFor) {
@@ -6928,16 +7084,19 @@
         }
 
         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);
         });
       }
     });
@@ -6951,11 +7110,13 @@
         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,
@@ -7917,7 +8078,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.1',
+      version: '3.2.2',
       manager: manager,
       extendApi: extendApi,
       install: install,