From 093055940a1162d50df882216fca7a7b88208964 Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Thu, 10 Sep 2020 15:31:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(bug):=20=E4=BF=AE=E6=94=B9entity=20?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=A4=A7=E5=B0=8F=E5=86=99=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BaseDialog/FormDesignerDialog.vue | 1 +
 src/components/FormDesigner/GenerateFormItem.vue | 4 ++--
 src/components/FormDesigner/WidgetConfig.vue     | 4 ++--
 src/views/system/Users.vue                       | 2 +-
 src/views/system/users.vue                       | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/BaseDialog/FormDesignerDialog.vue b/src/components/BaseDialog/FormDesignerDialog.vue
index e3b1977..6efcd1f 100644
--- a/src/components/BaseDialog/FormDesignerDialog.vue
+++ b/src/components/BaseDialog/FormDesignerDialog.vue
@@ -145,6 +145,7 @@
                   @on-submit="handleTest"
                   width="1000px"
                   form>
+        <el-alert type="warning" :closable="false" class="mb-15">组件依赖远端数据需要结合代码实际预览,此处无法直接预览效果!</el-alert>
         <generate-form v-if="previewVisible"
                        :data="widgetForm"
                        :remote="remoteFuncsForPreview"
diff --git a/src/components/FormDesigner/GenerateFormItem.vue b/src/components/FormDesigner/GenerateFormItem.vue
index e72e7c3..4e99ff7 100644
--- a/src/components/FormDesigner/GenerateFormItem.vue
+++ b/src/components/FormDesigner/GenerateFormItem.vue
@@ -394,8 +394,8 @@ export default class GenerateFormItem extends Vue {
           this.visible = true;
         } else {
           this.widget.options.remoteOptions = res.data.list.map(item => ({
-            value: item.codevalue,
-            label: item.codename,
+            value: item.codeValue,
+            label: item.codeName,
           }));
         }
 
diff --git a/src/components/FormDesigner/WidgetConfig.vue b/src/components/FormDesigner/WidgetConfig.vue
index 8892f7f..a52d60f 100644
--- a/src/components/FormDesigner/WidgetConfig.vue
+++ b/src/components/FormDesigner/WidgetConfig.vue
@@ -647,8 +647,8 @@ export default {
     // 请求字典分类
     crud(DML.SELECT, 'ad_codelist_type').then((res) => {
       this.dictType = res.data.list.map(item => ({
-        label: item.codename,
-        value: item.codevalue,
+        label: item.codeName,
+        value: item.codeValue,
       }));
     });
   },
diff --git a/src/views/system/Users.vue b/src/views/system/Users.vue
index da673df..8debdeb 100644
--- a/src/views/system/Users.vue
+++ b/src/views/system/Users.vue
@@ -144,7 +144,7 @@ export default {
         funcGetRole(resolve) {
           crud(DML.SELECT, 'role').then((res) => {
             const options = res.data.list.map(item => ({
-              label: item.rolename,
+              label: item.roleName,
               value: item.id,
             }));
             resolve(options);
diff --git a/src/views/system/users.vue b/src/views/system/users.vue
index da673df..8debdeb 100644
--- a/src/views/system/users.vue
+++ b/src/views/system/users.vue
@@ -144,7 +144,7 @@ export default {
         funcGetRole(resolve) {
           crud(DML.SELECT, 'role').then((res) => {
             const options = res.data.list.map(item => ({
-              label: item.rolename,
+              label: item.roleName,
               value: item.id,
             }));
             resolve(options);