@form-create/element-ui 2.5.11 → 2.5.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@form-create/element-ui",
-    "version": "2.5.11",
+    "version": "2.5.15",
     "description": "element-ui动态表单|form-create is a form generation component that can generate dynamic rendering, data collection, verification and submission functions through JSON. Supports 3 UI frameworks, and supports the generation of any Vue components. Built-in 20 kinds of commonly used form components and custom components, no matter how complex forms can be easily handled.",
     "main": "./dist/form-create.min.js",
     "module": "./dist/form-create.min.js",
@@ -43,27 +43,27 @@
     },
     "homepage": "http://www.form-create.com",
     "dependencies": {
-        "@form-create/component-elm-checkbox": "^2.5.11",
-        "@form-create/component-elm-frame": "^2.5.11",
-        "@form-create/component-elm-group": "^2.5.11",
-        "@form-create/component-elm-radio": "^2.5.11",
-        "@form-create/component-elm-select": "^2.5.11",
-        "@form-create/component-elm-tree": "^2.5.11",
-        "@form-create/component-elm-upload": "^2.5.11",
-        "@form-create/component-subform": "^2.5.10",
-        "@form-create/core": "^2.5.11",
-        "@form-create/utils": "^2.5.11"
+        "@form-create/component-elm-checkbox": "^2.5.15",
+        "@form-create/component-elm-frame": "^2.5.15",
+        "@form-create/component-elm-group": "^2.5.15",
+        "@form-create/component-elm-radio": "^2.5.15",
+        "@form-create/component-elm-select": "^2.5.15",
+        "@form-create/component-elm-tree": "^2.5.15",
+        "@form-create/component-elm-upload": "^2.5.15",
+        "@form-create/component-subform": "^2.5.12",
+        "@form-create/core": "^2.5.15",
+        "@form-create/utils": "^2.5.15"
     },
     "publishConfig": {
         "access": "public"
     },
     "devDependencies": {
-        "@form-create/component-wangeditor": "^2.5.5",
+        "@form-create/component-wangeditor": "^2.5.15",
         "@vue/cli-plugin-babel": "~4.5.0",
         "@vue/cli-service": "^4.5.3",
         "@vue/composition-api": "^1.0.0-beta.22",
         "element-ui": "^2.13.2",
         "v-jsoneditor": "^1.4.2"
     },
-    "gitHead": "ccd7ba699b3a877c9f2f2ec3c58a808128cee914"
+    "gitHead": "8c06b8fe5cf6d310e24733d86787068a7d8d2d9c"
 }

package/src/core/manager.js

@@ -119,6 +119,7 @@ export default {
         const item = isFalse(rule.wrap.show) ? children : this.$r(mergeProps([rule.wrap, {
             props: {
                 labelWidth: labelWidth === void 0 ? labelWidth : toString(labelWidth),
+                label: isTitle ? rule.title.title : undefined,
                 ...(rule.wrap || {}),
                 prop: ctx.id,
                 rules: rule.validate,
@@ -131,7 +132,7 @@ export default {
         return (inline === true || isFalse(_col) || isFalse(col.show)) ? item : this.makeCol(rule, uni, [item]);
     },
     isTitle(rule) {
-        if(this.options.form.title === false) return false;
+        if (this.options.form.title === false) return false;
         const title = rule.title;
         return !((!title.title && !title.native) || isFalse(title.show))
     },
@@ -140,39 +141,34 @@ export default {
         const infoProp = rule.info;
         const isTip = isTooltip(infoProp);
         const form = this.options.form;
-        const children = [titleProp.title + (form.labelSuffix || form['label-suffix'] || '')];
-        const titleFn = (pop) => this.$r(mergeProps([titleProp, {
-            props: titleProp,
-            slot: titleProp.slot || (pop ? (isTip ? 'default' : 'reference') : 'label'),
-            key: `${uni}tit`,
-            type: titleProp.type || 'span',
-        }]), children);
+        const children = [(titleProp.title || '') + (form.labelSuffix || form['label-suffix'] || '')];
 
-        if (!isFalse(infoProp.show) && (infoProp.info || infoProp.native)) {
-            if (infoProp.icon !== false) {
-                children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r({
-                    type: 'i',
-                    class: infoProp.icon === true ? 'el-icon-warning' : infoProp.icon,
-                    key: `${uni}i`
-                }));
-            }
+        if (!isFalse(infoProp.show) && (infoProp.info || infoProp.native) && !isFalse(infoProp.icon)) {
             const prop = {
                 type: infoProp.type || 'popover',
                 props: {...infoProp},
                 key: `${uni}pop`,
                 slot: 'label'
             };
-
             const field = 'content';
             if (infoProp.info && !hasProperty(prop.props, field)) {
                 prop.props[field] = infoProp.info;
             }
-
-            return this.$r(mergeProps([infoProp, prop]), [
-                titleFn(true)
-            ])
+            children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r(mergeProps([infoProp, prop]), [
+                this.$r({
+                    type: 'i',
+                    slot: isTip ? 'default' : 'reference',
+                    class: infoProp.icon === true ? 'el-icon-warning' : infoProp.icon,
+                    key: `${uni}i`
+                })
+            ]));
         }
-        return titleFn();
+        return this.$r(mergeProps([titleProp, {
+            props: titleProp,
+            slot: titleProp.slot || 'label',
+            key: `${uni}tit`,
+            type: titleProp.type || 'span',
+        }]), children);
     },
     makeCol(rule, uni, children) {
         const col = rule.col;