@form-create/element-ui 3.0.0-alpha.3 → 3.0.0-alpha.4

package/dist/form-create.esm.js

@@ -1,11 +1,10 @@
 /*!
- * @form-create/element-ui v3.0.0-alpha.3
- * (c) 2018-2021 xaboy
+ * @form-create/element-ui v3.0.0-alpha.4
+ * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
 import { defineComponent, toRefs, inject, ref, toRef, watch, resolveComponent, createVNode, mergeProps as mergeProps$1, isVNode, nextTick, markRaw, reactive, getCurrentInstance, provide, onMounted, onBeforeUnmount, onUpdated, computed, customRef, withDirectives, resolveDirective, createApp, h } from 'vue';
-import ElementPlus from 'element-plus';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -1394,7 +1393,8 @@ var Group = defineComponent({
           });
         }
       },
-      deep: true
+      deep: true,
+      flush: 'post'
     }
   },
   methods: {
@@ -1569,13 +1569,13 @@ var Group = defineComponent({
   created: function created() {
     var d = (this.expand || 0) - this.modelValue.length;
 
-    if (d > 0) {
-      this.expandRule(d);
-    }
-
     for (var i = 0; i < this.modelValue.length; i++) {
       this.addRule(i);
     }
+
+    if (d > 0) {
+      this.expandRule(d);
+    }
   },
   render: function render() {
     var _this9 = this;
@@ -1968,11 +1968,11 @@ function deepExtend(origin) {
         $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;
           }
         }
@@ -2023,7 +2023,7 @@ function toJson(obj, space) {
       return val;
     }
 
-    if (hasProperty(val, '__json')) {
+    if (val.__json) {
       return val.__json;
     }
 
@@ -2224,33 +2224,6 @@ function toProps(rule) {
   return prop;
 }
 
-function toString(val) {
-  return val == null ? '' : _typeof(val) === 'object' ? JSON.stringify(val, null, 2) : String(val);
-}
-
-var id$1 = 0;
-function uniqueId() {
-  return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id$1)).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: {},
@@ -2764,11 +2737,55 @@ function lower(str) {
   return str.replace(str[0], str[0].toLowerCase());
 }
 
+function toString(val) {
+  return val == null ? '' : _typeof(val) === 'object' ? JSON.stringify(val, null, 2) : String(val);
+}
+
+var id$1 = 0;
+function uniqueId() {
+  return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id$1)).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$1(Render) {
   extend(Render.prototype, {
     initRender: function initRender() {
       this.cacheConfig = {};
     },
+    getTypeSlot: function getTypeSlot(type) {
+      var name = 'type-' + toLine(type);
+
+      var _fn = function _fn(vm) {
+        if (vm) {
+          var slot = vm.slots[name] || vm.slots['type-' + type];
+
+          if (slot) {
+            return slot;
+          }
+
+          return _fn(vm.setupState.parent);
+        }
+      };
+
+      return _fn(this.vm);
+    },
     render: function render() {
       var _this = this;
 
@@ -2876,12 +2893,12 @@ function useRender$1(Render) {
               children = _this4.renderChildren(ctx);
             }
 
-            var slot = 'type-' + toLine(ctx.type);
+            var slot = _this4.getTypeSlot(ctx.type);
 
             var _vn;
 
-            if (_this4.vm.slots[slot]) {
-              _vn = _this4.vm.slots[slot]({
+            if (slot) {
+              _vn = slot({
                 rule: rule,
                 prop: prop,
                 preview: preview,
@@ -3415,7 +3432,7 @@ extend(RuleContext.prototype, {
     var _this2 = this;
 
     nextTick(function () {
-      _this2.$handle.watchCtx(_this2);
+      _this2.$handle && _this2.$handle.watchCtx(_this2);
     });
   },
   "delete": function _delete() {
@@ -4134,7 +4151,7 @@ function useContext(Handler) {
       var none = ['field', 'value', 'vm', 'template', 'name', 'config', 'control', 'inject', 'sync', 'payload', 'optionsTo', 'update'];
       var all = attrs();
       all.filter(function (k) {
-        return none.indexOf(k) === -1;
+        return k[0] !== '_' && none.indexOf(k) === -1;
       }).forEach(function (key) {
         var ref = toRef(ctx.rule, key);
         var flag = key === 'children';
@@ -4588,8 +4605,12 @@ var vnode = defineComponent({
 
 function tidyDirectives(directives) {
   return Object.keys(directives).map(function (n) {
-    var directive = directives[n];
-    return [resolveDirective(n), directive.arg, directive.value, directive.modifiers];
+    var data = directives[n];
+    var directive = resolveDirective(n);
+    if (!directive) return;
+    return [directive, data.value, data.arg, data.modifiers];
+  }).filter(function (v) {
+    return !!v;
   });
 }
 
@@ -5861,16 +5882,11 @@ function install(FormCreate) {
   });
 }
 
-function appUse(app) {
-  app.use(ElementPlus);
-}
-
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.0.0-alpha.3',
+    version: '3.0.0-alpha.4',
     manager: manager,
-    appUse: appUse,
     extendApi: extendApi,
     install: install,
     attrs: {