@form-create/iview 2.7.3 → 2.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@form-create/iview",
-    "version": "2.7.3",
+    "version": "2.7.5",
     "description": "Iview版本低代码表单|FormCreate 是一个可以通过 JSON 生成具有动态渲染、数据收集、验证和提交功能的低代码表单生成组件。支持6个UI框架，适配移动端，并且支持生成任何 Vue 组件。内置20种常用表单组件和自定义组件，再复杂的表单都可以轻松搞定。",
     "main": "./dist/form-create.min.js",
     "module": "./dist/form-create.esm.js",
@@ -46,13 +46,13 @@
     "dependencies": {
         "@form-create/component-ivu-checkbox": "^2.7.1",
         "@form-create/component-ivu-frame": "^2.7.2",
-        "@form-create/component-ivu-group": "^2.7.3",
+        "@form-create/component-ivu-group": "^2.7.5",
         "@form-create/component-ivu-radio": "^2.7.1",
         "@form-create/component-ivu-select": "^2.7.1",
         "@form-create/component-ivu-tree": "^2.7.1",
         "@form-create/component-ivu-upload": "^2.7.1",
         "@form-create/component-subform": "^2.7.1",
-        "@form-create/core": "^2.7.3",
+        "@form-create/core": "^2.7.5",
         "@form-create/utils": "^2.7.0"
     },
     "publishConfig": {
@@ -64,5 +64,5 @@
         "v-jsoneditor": "^1.4.2",
         "vue": "2.7"
     },
-    "gitHead": "e20c2a0c6d4746e1ddfbcd66e804f6d80925ee90"
+    "gitHead": "63b1bb5c4d88b65bdd48517d6b3b3090792d6c1a"
 }

package/src/core/api.js

@@ -24,7 +24,7 @@ export default function extendApi(api, h) {
             return new Promise((resolve, reject) => {
                 const forms = api.children;
                 const all = [h.$manager.validate()];
-                forms.forEach(v => {
+                forms.filter(v=>!v.isScope).forEach(v => {
                     all.push(v.validate());
                 })
                 Promise.all(all).then(() => {
@@ -43,7 +43,7 @@ export default function extendApi(api, h) {
                 if (!ctx) return;
                 const sub = h.subForm[ctx.id];
                 const all = [h.$manager.validateField(ctx.id)];
-                toArray(sub).forEach(v => {
+                toArray(sub).filter(v=>!v.isScope).forEach(v => {
                     all.push(v.validate());
                 })
                 Promise.all(all).then(() => {
@@ -115,7 +115,8 @@ export default function extendApi(api, h) {
         },
         submit(successFn, failFn) {
             return new Promise((resolve, reject) => {
-                api.validate().then(() => {
+                const promise = h.options.validateOnSubmit === false ? Promise.resolve() : api.validate();
+                promise.then(() => {
                     let formData = api.formData();
                     is.Function(successFn) && invoke(() => successFn(formData, api));
                     is.Function(h.options.onSubmit) && invoke(() => h.options.onSubmit(formData, api));

package/src/core/manager.js

@@ -146,10 +146,10 @@ export default {
         const form = this.options.form;
         const titleSlot = this.getSlot('title');
         const children = [titleSlot ? titleSlot({
-            title: ctx.refRule?.__$title.value,
+            title: ctx.refRule?.__$title?.value,
             rule: ctx.rule,
             options: this.options
-        }) : ((ctx.refRule?.__$title.value) + (form.labelSuffix || form['label-suffix'] || ''))];
+        }) : ((ctx.refRule?.__$title?.value) + (form.labelSuffix || form['label-suffix'] || ''))];
 
         if (!isFalse(infoProp.show) && (infoProp.info || infoProp.native) && !isFalse(infoProp.icon)) {
             const prop = {
@@ -167,7 +167,7 @@ export default {
 
             const field = 'content';
             if (infoProp.info && !hasProperty(prop.props, field)) {
-                prop.props[field] = ctx.refRule?.__$info.value;
+                prop.props[field] = ctx.refRule?.__$info?.value;
             }
             children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r(mergeProps([infoProp, prop]), [
                 this.$r({

package/src/core/provider.js

@@ -15,7 +15,7 @@ const required = {
                 },
                 ...val,
             };
-            const title = rule.__fc__.refRule.__$title.value;
+            const title = rule.__fc__.refRule?.__$title?.value;
             if (!validate.message) {
                 validate.message = api.t('required', {title}) || (title + (api.getLocale() === 'en' ? ' is required' : '不能为空'));
             } else {