From f82826d8340c703edb35894bb9a88ef39bbf0cb0 Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 2 Apr 2021 13:56:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 5d24382..67f63a0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,7 +32,13 @@ Vue.component('page-container', PageHeaderWrapper)
 Vue.component('page-header-wrapper', PageHeaderWrapper)
 
 // eslint-disable-next-line no-undef
-Vue.prototype.SYS_DICT = SYS_DICT
+if (typeof SYS_DICT !== 'undefined') {
+  // eslint-disable-next-line no-undef
+  Vue.prototype.SYS_DICT = SYS_DICT
+} else {
+  Vue.prototype.SYS_DICT = {}
+  console.warn('后端字典数据加载失败[static/data/js/sys-dict.js]，请检查后端访问地址是否正确')
+}
 
 window.umi_plugin_ant_themeVar = themePluginConfig.theme
 
-- 
Gitee


From affec056aec9b97a56321c7ced1d31ef0510389e Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 2 Apr 2021 14:07:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E6=9D=A1=E8=B7=B3=E8=BF=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/generator/BaseInfo.vue | 9 ++++++++-
 src/views/generator/View.vue     | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/generator/BaseInfo.vue b/src/views/generator/BaseInfo.vue
index dd92b3d..7619ae4 100644
--- a/src/views/generator/BaseInfo.vue
+++ b/src/views/generator/BaseInfo.vue
@@ -205,6 +205,14 @@ export default {
       default: null
     }
   },
+  watch: {
+    model: {
+      deep: true,
+      handler: function () {
+        this.$emit('input', this.model)
+      }
+    }
+  },
   data () {
     return {
       FORM_LAYOUT: FORM_LAYOUT,
@@ -274,7 +282,6 @@ export default {
           apiPath: `/api/${getControllerMapping(name)}.js`,
           tableFields: fields
         })
-        this.$emit('input', this.model)
       })
       if (isBlank(this.model.backEndPath)) {
         let matchingModule
diff --git a/src/views/generator/View.vue b/src/views/generator/View.vue
index 8192ae5..9d917d1 100644
--- a/src/views/generator/View.vue
+++ b/src/views/generator/View.vue
@@ -73,7 +73,7 @@ export default {
       },
       steps: [
         { title: '基本信息', disabled: false },
-        { title: '字段信息', disabled: false },
+        { title: '字段信息', disabled: true },
         { title: '列表页面', disabled: true },
         { title: '详情页面', disabled: true },
         { title: '导入&导出', disabled: true },
@@ -88,6 +88,7 @@ export default {
           // this.steps[this.current + 1].disabled = false
           switch (this.current) {
             case 0:
+              this.steps[1].disabled = this.model.genFile.indexOf(GENERATOR_FILE.LIST_VUE) === -1 && this.model.genFile.indexOf(GENERATOR_FILE.INPUT_VUE) === -1
               break
             case 1:
               this.model.fieldSets = this.$refs.steps1.data
-- 
Gitee


From 4e69afba1394a370b07f458bba791825f4ff9463 Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 2 Apr 2021 14:13:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=95=B0=E9=AA=8C=E8=AF=81=E4=B8=BA?=
 =?UTF-8?q?15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/permissions/View.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sys/permissions/View.vue b/src/views/sys/permissions/View.vue
index e0e2a20..4a608da 100644
--- a/src/views/sys/permissions/View.vue
+++ b/src/views/sys/permissions/View.vue
@@ -217,7 +217,7 @@ export default {
         ],
         name: [
           { required: true, message: '请输入菜单名称', trigger: 'blur' },
-          { max: 10, message: '菜单名称字数不能超过10个字符', trigger: 'blur' }
+          { max: 15, message: '菜单名称字数不能超过15个字符', trigger: 'blur' }
         ],
         code: [
           { max: 50, message: '权限标识不能超过50个字符', trigger: 'blur' }
-- 
Gitee