diff --git a/src/main.js b/src/main.js index 5d243821783aa7222d92c3ff5e7487b89608e7ab..67f63a0d3efe1558442fcc3fbcae9e5729350815 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 diff --git a/src/views/generator/BaseInfo.vue b/src/views/generator/BaseInfo.vue index dd92b3d71166a0ba717e563a03b3fcf1ec5f1dc2..7619ae4741bab6542b28300fe9a9af586b5d82a3 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 8192ae543dc0c1a7bf9325de2c6e42e3f4bf7aa3..9d917d16396016ec7d21dfa0a449e97c9618e177 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 diff --git a/src/views/sys/permissions/View.vue b/src/views/sys/permissions/View.vue index e0e2a20f0a68c9d0f90a638431b9cd7773face91..4a608da7e0915cee170427c571a716c7904e975d 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' }