From 44b2423eb178ad72898f225004c2d5861a4f2a07 Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Thu, 30 Jun 2022 12:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=AB=98=E7=BA=A7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=BB=84=E4=BB=B6=E9=81=97=E6=BC=8F=E7=9A=84labelAlig?=
 =?UTF-8?q?n=E5=92=8CcolumnWidth=E5=B1=9E=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form-widget/field-widget/file-upload-widget.vue       | 2 +-
 .../form-widget/field-widget/picture-upload-widget.vue    | 2 +-
 .../form-designer/widget-panel/widgetsConfig.js           | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/form-designer/form-widget/field-widget/file-upload-widget.vue b/src/components/form-designer/form-widget/field-widget/file-upload-widget.vue
index 7caf101..3caaa99 100644
--- a/src/components/form-designer/form-widget/field-widget/file-upload-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/file-upload-widget.vue
@@ -128,7 +128,7 @@
     methods: {
       handleFileExceed() {
         let uploadLimit = this.field.options.limit  /* 此行不能注释，下一行ES6模板字符串需要用到！！ */
-        this.$message.warning(eval('`' + this.i18nt('render.hint.uploadExceed') + '`'));
+        this.$message.warning( this.i18nt('render.hint.uploadExceed').replace('${uploadLimit}', uploadLimit) )
       },
 
       updateUploadFieldModelAndEmitDataChange(fileList) {
diff --git a/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue b/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
index 228ea97..dc2fbe3 100644
--- a/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
@@ -108,7 +108,7 @@
     methods: {
       handlePictureExceed() {
         let uploadLimit = this.field.options.limit  /* 此行不能注释，下一行ES6模板字符串需要用到！！ */
-        this.$message.warning(eval('`' + this.i18nt('render.hint.uploadExceed') + '`'));
+        this.$message.warning( this.i18nt('render.hint.uploadExceed').replace('${uploadLimit}', uploadLimit) )
       },
 
       updateUploadFieldModelAndEmitDataChange(fileList) {
diff --git a/src/components/form-designer/widget-panel/widgetsConfig.js b/src/components/form-designer/widget-panel/widgetsConfig.js
index 5ba2036..161140c 100644
--- a/src/components/form-designer/widget-panel/widgetsConfig.js
+++ b/src/components/form-designer/widget-panel/widgetsConfig.js
@@ -750,8 +750,10 @@ export const advancedFields = [
     options: {
       name: '',
       label: '',
+      labelAlign: '',
       labelWidth: null,
       labelHidden: false,
+      columnWidth: '200px',
       disabled: false,
       hidden: false,
       required: false,
@@ -793,8 +795,10 @@ export const advancedFields = [
     options: {
       name: '',
       label: '',
+      labelAlign: '',
       labelWidth: null,
       labelHidden: false,
+      columnWidth: '200px',
       disabled: false,
       hidden: false,
       required: false,
@@ -835,9 +839,11 @@ export const advancedFields = [
     options: {
       name: '',
       label: '',
+      labelAlign: '',
       placeholder: '',
       labelWidth: null,
       labelHidden: false,
+      columnWidth: '200px',
       contentHeight: '200px',
       disabled: false,
       hidden: false,
@@ -867,11 +873,13 @@ export const advancedFields = [
     options: {
       name: '',
       label: '',
+      labelAlign: '',
       defaultValue: '',
       placeholder: '',
       size: '',
       labelWidth: null,
       labelHidden: false,
+      columnWidth: '200px',
       disabled: false,
       hidden: false,
       clearable: true,