diff --git a/README.md b/README.md index 206cd53..59655bd 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,11 @@ ### 立即体验VForm 3 [在线Demo](http://120.92.142.115:81/vform3/) - ### 立即体验VForm 3 Pro高级版(提供商业支持) - [VForm 3 Pro Demo](https://vform666.com/pages/pro/) +### 立即体验VForm 3 Pro高级版(提供商业支持) +[VForm 3 Pro Demo](https://vform666.com/pages/pro/) + +### 视频教程集合: +[B站观看](https://space.bilibili.com/626932375) ### 适合Vue 2的版本看这里 [点此查看](https://gitee.com/vdpadmin/variant-form) diff --git a/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue b/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue index 4a899ac..94bf0d2 100644 --- a/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue +++ b/src/components/form-designer/form-widget/container-widget/table-cell-widget.vue @@ -1,6 +1,6 @@ diff --git a/src/components/form-designer/setting-panel/property-editor/container-table-cell/wordBreak-editor.vue b/src/components/form-designer/setting-panel/property-editor/container-table-cell/wordBreak-editor.vue new file mode 100644 index 0000000..0417fee --- /dev/null +++ b/src/components/form-designer/setting-panel/property-editor/container-table-cell/wordBreak-editor.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/components/form-designer/setting-panel/property-editor/field-static-text/fontSize-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-static-text/fontSize-editor.vue new file mode 100644 index 0000000..b2c1758 --- /dev/null +++ b/src/components/form-designer/setting-panel/property-editor/field-static-text/fontSize-editor.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/components/form-designer/setting-panel/property-editor/field-static-text/preWrap-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-static-text/preWrap-editor.vue new file mode 100644 index 0000000..61ee8a3 --- /dev/null +++ b/src/components/form-designer/setting-panel/property-editor/field-static-text/preWrap-editor.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/components/form-designer/setting-panel/property-editor/field-static-text/textContent-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-static-text/textContent-editor.vue index 1056131..5c6e145 100644 --- a/src/components/form-designer/setting-panel/property-editor/field-static-text/textContent-editor.vue +++ b/src/components/form-designer/setting-panel/property-editor/field-static-text/textContent-editor.vue @@ -1,6 +1,6 @@ diff --git a/src/components/form-designer/setting-panel/property-editor/textAlign-editor.vue b/src/components/form-designer/setting-panel/property-editor/textAlign-editor.vue new file mode 100644 index 0000000..0d49890 --- /dev/null +++ b/src/components/form-designer/setting-panel/property-editor/textAlign-editor.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/components/form-designer/setting-panel/propertyRegister.js b/src/components/form-designer/setting-panel/propertyRegister.js index af71756..0d98156 100644 --- a/src/components/form-designer/setting-panel/propertyRegister.js +++ b/src/components/form-designer/setting-panel/propertyRegister.js @@ -34,6 +34,9 @@ const COMMON_PROPERTIES = { 'editable' : 'editable-editor', 'showPassword' : 'showPassword-editor', 'textContent' : 'textContent-editor', + 'textAlign' : 'textAlign-editor', + 'fontSize' : 'fontSize-editor', + 'preWrap' : 'preWrap-editor', 'htmlContent' : 'htmlContent-editor', 'format' : 'format-editor', 'valueFormat' : 'valueFormat-editor', @@ -63,6 +66,7 @@ const COMMON_PROPERTIES = { 'cellWidth' : 'cellWidth-editor', 'cellHeight' : 'cellHeight-editor', 'colHeight' : 'colHeight-editor', + 'wordBreak' : 'wordBreak-editor', 'gutter' : 'gutter-editor', 'responsive' : 'responsive-editor', 'span' : 'span-editor', diff --git a/src/components/form-designer/widget-panel/widgetsConfig.js b/src/components/form-designer/widget-panel/widgetsConfig.js index 5e77076..150514c 100644 --- a/src/components/form-designer/widget-panel/widgetsConfig.js +++ b/src/components/form-designer/widget-panel/widgetsConfig.js @@ -73,6 +73,7 @@ export const containers = [ cellHeight: '', colspan: 1, rowspan: 1, + wordBreak: false, //是否自动换行 customClass: '', //自定义css类名 } }, @@ -669,6 +670,9 @@ export const basicFields = [ columnWidth: '200px', hidden: false, textContent: 'static text', + textAlign: 'left', + fontSize: '13px', + preWrap: false, //是否自动换行 //------------------- customClass: '', //自定义css类名 //------------------- diff --git a/src/components/form-render/container-item/table-cell-item.vue b/src/components/form-render/container-item/table-cell-item.vue index 3520cac..7c2aa7b 100644 --- a/src/components/form-render/container-item/table-cell-item.vue +++ b/src/components/form-render/container-item/table-cell-item.vue @@ -1,7 +1,7 @@