@form-create/element-ui 3.2.24 → 3.2.26

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.24
+ * @form-create/element-ui v3.2.26
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1453,6 +1453,7 @@ var Upload = defineComponent({
     httpRequest: Function,
     modalTitle: String,
     listType: String,
+    uploadText: String,
     formCreateInject: Object,
     modelValue: [Array, String, Object]
   },
@@ -1547,7 +1548,7 @@ var Upload = defineComponent({
           "type": "primary"
         }, {
           "default": function _default() {
-            return [_this.formCreateInject.t('clickToUpload') || '点击上传'];
+            return [_this.formCreateInject.t('clickToUpload') || _this.uploadText || '点击上传'];
           }
         }))];
       }
@@ -2758,6 +2759,7 @@ function $FormCreate(FormCreate, components, directives) {
       index: [String, Number],
       api: Object,
       locale: [String, Object],
+      t: Function,
       name: String,
       subForm: {
         type: Boolean,
@@ -6757,19 +6759,34 @@ function useLifecycle(Handler) {
 
       var hook = (_ctx$prop = ctx.prop) === null || _ctx$prop === void 0 ? void 0 : (_ctx$prop$hook = _ctx$prop.hook) === null || _ctx$prop$hook === void 0 ? void 0 : _ctx$prop$hook[name];
 
-      if (hook) {
-        hook = Array.isArray(hook) ? hook : [hook];
-        hook.forEach(function (fn) {
-          invoke(function () {
-            return fn(_objectSpread2(_objectSpread2({}, args || {}), {}, {
-              self: ctx.rule,
-              rule: ctx.rule,
-              $f: _this2.api,
-              api: _this2.api,
-              option: _this2.vm.props.option
-            }));
+      var run = function run(on, p) {
+        if (on) {
+          on = Array.isArray(on) ? on : [on];
+          on.forEach(function (fn) {
+            invoke(function () {
+              return fn(_objectSpread2(_objectSpread2({}, args || {}), {}, {
+                self: ctx.rule,
+                rule: ctx.rule,
+                parent: p === null || p === void 0 ? void 0 : p.rule,
+                $f: _this2.api,
+                api: _this2.api,
+                option: _this2.vm.props.option
+              }));
+            });
           });
-        });
+        }
+      };
+
+      run(hook);
+      var deepName = 'deep' + upper(name);
+      var parent = ctx.parent;
+
+      while (parent) {
+        var _parent$prop, _parent$prop$hook;
+
+        var deepHook = (_parent$prop = parent.prop) === null || _parent$prop === void 0 ? void 0 : (_parent$prop$hook = _parent$prop.hook) === null || _parent$prop$hook === void 0 ? void 0 : _parent$prop$hook[deepName];
+        run(deepHook, parent);
+        parent = parent.parent;
       }
     }
   });
@@ -7147,7 +7164,8 @@ function CreateNodeFactory() {
       }
     },
     h: function h(tag, data, children) {
-      var isNativeTag = this.vm.appContext.config.isNativeTag(tag);
+      var vm = this.vm || getCurrentInstance();
+      var isNativeTag = vm.appContext.config.isNativeTag(tag);
 
       if (isNativeTag) {
         delete data.formCreateInject;
@@ -7460,8 +7478,8 @@ var componentValidate = {
       }
 
       var method = options.method;
-      delete options.method;
-      attr.getProp().validate = [_objectSpread2(_objectSpread2({}, options), {}, {
+
+      var validate = _objectSpread2(_objectSpread2({}, options), {}, {
         validator: function validator() {
           var ctx = byCtx(rule);
 
@@ -7477,7 +7495,10 @@ var componentValidate = {
             }]));
           }
         }
-      })];
+      });
+
+      delete validate.method;
+      attr.getProp().validate = [validate];
     }
   },
   watch: function watch() {
@@ -8317,10 +8338,17 @@ function FormCreateFactory(config) {
       return 'zh-cn';
     },
     globalLanguageDriver: function globalLanguageDriver(id) {
+      var t = this.vm.setupState.top.props.t;
       var locale = this.vm.setupState.top.props.locale;
       var value = undefined;
 
-      if (locale && _typeof(locale) === 'object') {
+      if (t) {
+        value = invoke(function () {
+          return t(id);
+        });
+      }
+
+      if (value == null && locale && _typeof(locale) === 'object') {
         value = deepGet(locale, id);
       }
 
@@ -9050,6 +9078,8 @@ var manager = {
     var _this$rule$props = this.rule.props,
         inline = _this$rule$props.inline,
         _col = _this$rule$props.col;
+    var cls = rule.wrap["class"];
+    delete rule.wrap["class"];
     delete rule.wrap.title;
     var item = isFalse(rule.wrap.show) ? children : this.$r(mergeProps([rule.wrap, {
       props: _objectSpread2(_objectSpread2({
@@ -9059,7 +9089,7 @@ var manager = {
         prop: ctx.id,
         rules: ctx.injectValidate()
       }),
-      "class": this.$render.mergeClass(rule.className, 'fc-form-item'),
+      "class": this.$render.mergeClass(cls || rule.className, 'fc-form-item'),
       key: "".concat(uni, "fi"),
       ref: ctx.wrapRef,
       type: 'formItem'
@@ -9603,7 +9633,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.24',
+    version: '3.2.26',
     manager: manager,
     extendApi: extendApi,
     install: install,