@form-create/element-ui 2.5.16 → 2.5.17

package/dist/form-create.js

@@ -1,6 +1,6 @@
 /*!
- * @form-create/element-ui v2.5.16
- * (c) 2018-2021 xaboy
+ * @form-create/element-ui v2.5.17
+ * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
@@ -2061,11 +2061,11 @@
           $set(origin, key, clone);
 
           if (!is.Undef(clone)) {
-            if (clone.__json !== undefined) {
+            if (!is.Undef(clone.__json)) {
               origin[key].__json = clone.__json;
             }
 
-            if (clone.__origin !== undefined) {
+            if (!is.Undef(clone.__origin)) {
               origin[key].__origin = clone.__origin;
             }
           }
@@ -2096,7 +2096,7 @@
         return val;
       }
 
-      if (hasProperty(val, '__json')) {
+      if (val.__json) {
         return val.__json;
       }
 
@@ -2207,39 +2207,6 @@
     return def;
   }
 
-  function toString(val) {
-    return val == null ? '' : _typeof(val) === 'object' ? JSON.stringify(val, null, 2) : String(val);
-  }
-
-  function toLine(name) {
-    var line = name.replace(/([A-Z])/g, '-$1').toLocaleLowerCase();
-    if (line.indexOf('-') === 0) line = line.substr(1);
-    return line;
-  }
-
-  var id = 0;
-  function uniqueId() {
-    return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
-  }
-
-  function deepSet(data, idx, val) {
-    var _data = data,
-        to;
-    (idx || '').split('.').forEach(function (v) {
-      if (to) {
-        if (!_data[to] || _typeof(_data[to]) != 'object') {
-          _data[to] = {};
-        }
-
-        _data = _data[to];
-      }
-
-      to = v;
-    });
-    _data[to] = val;
-    return _data;
-  }
-
   function baseRule() {
     return {
       props: {},
@@ -2761,6 +2728,39 @@
     return str.replace(str[0], str[0].toLowerCase());
   }
 
+  function toString(val) {
+    return val == null ? '' : _typeof(val) === 'object' ? JSON.stringify(val, null, 2) : String(val);
+  }
+
+  function toLine(name) {
+    var line = name.replace(/([A-Z])/g, '-$1').toLocaleLowerCase();
+    if (line.indexOf('-') === 0) line = line.substr(1);
+    return line;
+  }
+
+  var id = 0;
+  function uniqueId() {
+    return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
+  }
+
+  function deepSet(data, idx, val) {
+    var _data = data,
+        to;
+    (idx || '').split('.').forEach(function (v) {
+      if (to) {
+        if (!_data[to] || _typeof(_data[to]) != 'object') {
+          _data[to] = {};
+        }
+
+        _data = _data[to];
+      }
+
+      to = v;
+    });
+    _data[to] = val;
+    return _data;
+  }
+
   function useRender(Render) {
     extend(Render.prototype, {
       initRender: function initRender() {
@@ -2781,6 +2781,23 @@
       clearOrgChildren: function clearOrgChildren() {
         this.orgChildren = {};
       },
+      getTypeSlot: function getTypeSlot(type) {
+        var name = 'type-' + toLine(type);
+
+        var _fn = function _fn(vm) {
+          if (vm) {
+            var slot = vm.$scopedSlots[name] || vm.$scopedSlots['type-' + type];
+
+            if (slot) {
+              return slot;
+            }
+
+            return _fn(vm.$pfc);
+          }
+        };
+
+        return _fn(this.vm);
+      },
       render: function render() {
         var _this = this;
 
@@ -2976,10 +2993,10 @@
                 children = this.renderChildren(ctx);
               }
 
-              var slot = 'type-' + toLine(ctx.type);
+              var slot = this.getTypeSlot(ctx.type);
 
-              if (this.vm.$scopedSlots[slot]) {
-                vn = this.vm.$scopedSlots[slot]({
+              if (slot) {
+                vn = slot({
                   rule: rule,
                   prop: prop,
                   preview: preview,
@@ -4298,7 +4315,7 @@
         var vm = this.vm;
         var none = ['field', 'value', 'vm', 'template', 'name', 'config', 'control', 'inject', 'sync', 'payload', 'optionsTo', 'update'];
         Object.keys(ctx.rule).filter(function (k) {
-          return none.indexOf(k) === -1;
+          return k[0] !== '_' && none.indexOf(k) === -1;
         }).forEach(function (key) {
           var flag = key === 'children';
           ctx.watch.push(vm.$watch(function () {
@@ -6072,7 +6089,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.16"),
+      version: "".concat("2.5.17"),
       manager: manager,
       extendApi: extendApi,
       install: install,