@form-create/element-ui 3.2.12 → 3.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@form-create/element-ui",
-    "version": "3.2.12",
+    "version": "3.2.14",
     "description": "Element Plus版本低代码表单|FormCreate 是一个可以通过 JSON 生成具有动态渲染、数据收集、验证和提交功能的低代码表单生成组件。支持6个UI框架，适配移动端，并且支持生成任何 Vue 组件。内置20种常用表单组件和自定义组件，再复杂的表单都可以轻松搞定。",
     "main": "./dist/form-create.min.js",
     "module": "./dist/form-create.esm.js",
@@ -46,16 +46,16 @@
     },
     "homepage": "http://www.form-create.com/v3/",
     "dependencies": {
-        "@form-create/component-elm-checkbox": "^3.2.8",
-        "@form-create/component-elm-frame": "^3.2.0",
-        "@form-create/component-elm-group": "^3.2.8",
-        "@form-create/component-elm-radio": "^3.2.8",
-        "@form-create/component-elm-select": "^3.2.0",
-        "@form-create/component-elm-tree": "^3.2.9",
-        "@form-create/component-elm-upload": "^3.2.9",
+        "@form-create/component-elm-checkbox": "^3.2.14",
+        "@form-create/component-elm-frame": "^3.2.14",
+        "@form-create/component-elm-group": "^3.2.14",
+        "@form-create/component-elm-radio": "^3.2.14",
+        "@form-create/component-elm-select": "^3.2.14",
+        "@form-create/component-elm-tree": "^3.2.14",
+        "@form-create/component-elm-upload": "^3.2.14",
         "@form-create/component-subform": "^3.1.34",
-        "@form-create/core": "^3.2.12",
-        "@form-create/utils": "^3.2.0"
+        "@form-create/core": "^3.2.14",
+        "@form-create/utils": "^3.2.14"
     },
     "publishConfig": {
         "access": "public"
@@ -65,7 +65,7 @@
     },
     "devDependencies": {
         "@element-plus/icons-vue": "^0.2.7",
-        "@form-create/component-wangeditor": "^3.2.4",
+        "@form-create/component-wangeditor": "^3.2.14",
         "@vue/cli-plugin-babel": "~4.5.0",
         "@vue/cli-service": "^4.5.3",
         "element-plus": "^2.8.3",
@@ -88,5 +88,5 @@
             "esm"
         ]
     },
-    "gitHead": "81afc9dbc97908c11c30b6f1f7cbcebeb7c64731"
+    "gitHead": "e31cc649bf8c1199d8f8219e4cc3732d3dd458e3"
 }

package/src/core/alias.js

@@ -28,6 +28,7 @@ export default {
     autoComplete: PRE + '-autocomplete',
     auto: PRE + '-autocomplete',
     group: 'fc-group',
+    array: 'fc-group',
     object: 'fc-sub-form',
     subForm: 'fc-sub-form',
 }

package/src/core/manager.js

@@ -70,12 +70,7 @@ export default {
         return prop;
     },
     mergeProp(ctx) {
-        ctx.prop = mergeProps([{
-            info: this.options.info || {},
-            wrap: this.options.wrap || {},
-            col: this.options.col || {},
-            title: this.options.title || {},
-        }, ctx.prop], {
+        const def = {
             info: {
                 trigger: 'hover',
                 placement: 'top-start',
@@ -84,7 +79,10 @@ export default {
             title: {},
             col: {span: 24},
             wrap: {},
-        }, {normal: ['title', 'info', 'col', 'wrap']});
+        };
+        ['info', 'wrap', 'col', 'title'].forEach(name => {
+            ctx.prop[name] = mergeProps([this.options[name] || {}, ctx.prop[name] || {}], def[name]);
+        });
     },
     getDefaultOptions() {
         return getConfig();
@@ -107,7 +105,7 @@ export default {
         const {key, ref, $handle} = this;
         extend(this.rule, {key, ref});
         extend(this.rule.props, {
-            model: {...$handle.formData},
+            model: $handle.formData,
         });
     },
     render(children) {
@@ -132,7 +130,7 @@ export default {
                 prop: ctx.id,
                 rules: ctx.injectValidate(),
             },
-            class: rule.className,
+            class: this.$render.mergeClass(rule.className, 'fc-form-item'),
             key: `${uni}fi`,
             ref: ctx.wrapRef,
             type: 'formItem',
@@ -150,7 +148,11 @@ export default {
         const isTip = isTooltip(infoProp);
         const form = this.options.form;
         const titleSlot = this.getSlot('title');
-        const children = [titleSlot ? titleSlot({title: titleProp.title || '', rule: ctx.rule, options: this.options}) : ((titleProp.title || '') + (form.labelSuffix || form['label-suffix'] || ''))];
+        const children = [titleSlot ? titleSlot({
+            title: ctx.refRule.__$title.value,
+            rule: ctx.rule,
+            options: this.options
+        }) : ((ctx.refRule.__$title.value) + (form.labelSuffix || form['label-suffix'] || ''))];
 
         if (!isFalse(infoProp.show) && (infoProp.info || infoProp.native) && !isFalse(infoProp.icon)) {
             const prop = {
@@ -167,7 +169,7 @@ export default {
 
             const field = 'content';
             if (infoProp.info && !hasProperty(prop.props, field)) {
-                prop.props[field] = infoProp.info;
+                prop.props[field] = ctx.refRule.__$info.value;
             }
 
             children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r(mergeProps([infoProp, prop]), {
@@ -185,6 +187,7 @@ export default {
         const _prop = mergeProps([titleProp, {
             props: tidyRule(titleProp),
             key: `${uni}tit`,
+            class: 'fc-form-title',
             type: titleProp.type || 'span',
         }]);
 
@@ -197,7 +200,7 @@ export default {
     makeCol(rule, uni, children) {
         const col = rule.col;
         return this.$r({
-            class: col.class,
+            class: this.$render.mergeClass(col.class, 'fc-form-col'),
             type: 'col',
             props: col || {span: 24},
             key: `${uni}col`
@@ -208,7 +211,7 @@ export default {
         return this.$r({
             type: 'row',
             props: row,
-            class: row.class,
+            class: this.$render.mergeClass(row.class, 'fc-form-row'),
             key: `${this.key}row`
         }, children)
     },
@@ -225,6 +228,7 @@ export default {
         }
         const item = this.$r({
             type: 'formItem',
+            class: 'fc-form-item',
             key: `${this.key}fb`
         }, vn);
 
@@ -232,6 +236,7 @@ export default {
             ? item
             : this.$r({
                 type: 'col',
+                class: 'fc-form-col fc-form-footer',
                 props: {span: 24},
                 key: `${this.key}fc`
             }, [item]);
@@ -247,7 +252,7 @@ export default {
         return this.$r({
             type: 'button',
             props: resetBtn,
-            class: '_fc-reset-btn',
+            class: 'fc-reset-btn',
             style: {width: resetBtn.width},
             on: {
                 click: () => {
@@ -270,14 +275,15 @@ export default {
         return this.$r({
             type: 'button',
             props: submitBtn,
-            class: '_fc-submit-btn',
+            class: 'fc-submit-btn',
             style: {width: submitBtn.width},
             on: {
                 click: () => {
                     const fApi = this.$handle.api;
                     this.options.submitBtn.click
                         ? this.options.submitBtn.click(fApi)
-                        : fApi.submit().catch(()=>{});
+                        : fApi.submit().catch(() => {
+                        });
                 }
             },
             key: `${this.key}b1`,

package/src/core/provider.js

@@ -16,8 +16,12 @@ const required = {
                 ...val,
             };
             if (!validate.message) {
-                let title = rule.title || '';
-                validate.message = ((typeof title === 'object' ? title.title : title) || '') + '不能为空';
+                validate.message = rule.__fc__.refRule.__$title.value + (api.getLocale() === 'en' ? ' is required' : '不能为空');
+            } else {
+                const match = validate.message.match(/^\{\{\s*\$t\.(.+)\s*\}\}$/);
+                if (match) {
+                    validate.message = api.t(match[1], {title: rule.__fc__.refRule.__$title.value});
+                }
             }
             inject.getProp().validate = [validate];
         }

package/src/parsers/datePicker.js

@@ -3,6 +3,7 @@ import {creatorFactory} from '@form-create/core/src/index';
 const DEFAULT_FORMATS = {
     date: 'YYYY-MM-DD',
     month: 'YYYY-MM',
+    week: 'YYYY-wo',
     datetime: 'YYYY-MM-DD HH:mm:ss',
     timerange: 'HH:mm:ss',
     daterange: 'YYYY-MM-DD',

package/src/style/index.css

@@ -10,12 +10,12 @@
     display: none !important;
 }
 
-.fc-wrap-left .el-form-item__label {
-    justify-content: flex-start;
+.fc-wrap-right .el-form-item__label {
+    justify-content: flex-end;
 }
 
 .fc-wrap-left .el-form-item__label {
-    justify-content: flex-end;
+    justify-content: flex-start;
 }
 
 .fc-wrap-top.el-form-item {
@@ -44,3 +44,7 @@
     line-height: 20px;
     margin-bottom: 4px;
 }
+
+.fc-form-footer {
+    margin-top: 12px;
+}

package/types/config.d.ts

@@ -31,21 +31,21 @@ type RowProps = {
 }
 
 export interface OptionAttrs {
-    col?: Boolean | ColProps & {
+    col?: Boolean | Partial<ColProps & {
         labelWidth?: number | string;
         show?: Boolean;
-    };
-    row?: Boolean | RowProps & {
+    }>;
+    row?: Boolean | Partial<RowProps & {
         show?: Boolean;
-    };
-    info?: Boolean | VNodeRule & {
+    }>;
+    info?: Boolean | Partial<VNodeRule & {
         show?: Boolean;
         native?: Boolean;
         icon?: string;
         align?: 'left' | 'right';
         info?: string;
-    };
-    wrap?: Boolean | VNodeRule & {
+    }>;
+    wrap?: Boolean | Partial<VNodeRule & {
         labelWidth?: string
         required?: boolean
         error?: string
@@ -53,8 +53,8 @@ export interface OptionAttrs {
         inlineMessage?: boolean
         size?: ComponentSize
         show?: Boolean;
-    };
-    form?: {
+    }>;
+    form?: Partial<{
         inline?: boolean
         disabled?: boolean
         labelPosition?: string
@@ -67,29 +67,29 @@ export interface OptionAttrs {
         size?: ComponentSize
         className?: any;
         col?: Boolean;
-    };
+    }>;
 
-    submitBtn?: Boolean | ButtonProps & {
+    submitBtn?: Boolean | Partial<ButtonProps & {
         click?: Function;
         innerText?: string;
         show?: Boolean;
-    };
+    }>;
 
-    resetBtn?: Boolean | ButtonProps & {
+    resetBtn?: Boolean | Partial<ButtonProps & {
         click?: Function;
         innerText?: string;
         show?: Boolean;
-    };
+    }>;
 
 }
 
-declare const optionAttrs: OptionAttrs & {
-    title?: Boolean | VNodeRule & {
+declare const optionAttrs: Partial<OptionAttrs & {
+    title?: Boolean | Partial<VNodeRule & {
         show?: Boolean;
         native?: Boolean;
         title: string;
-    };
-};
+    }>;
+}>;
 
 export interface CreatorAttrs {
     col(props: typeof optionAttrs.col): this;