Commit aefd7d3177ecb14bcceefb34c6169eda44376975
1 parent
ae29751f
Jeecg-Boot 2.1.4 版本发布 | 重构较大,较多新功能
Showing
7 changed files
with
19 additions
and
14 deletions
ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
... | ... | @@ -10,12 +10,12 @@ |
10 | 10 | v-if="device==='mobile'" |
11 | 11 | class="trigger" |
12 | 12 | :type="collapsed ? 'menu-fold' : 'menu-unfold'" |
13 | - @click.native="toggle"></a-icon> | |
13 | + @click="toggle"></a-icon> | |
14 | 14 | <a-icon |
15 | 15 | v-else |
16 | 16 | class="trigger" |
17 | 17 | :type="collapsed ? 'menu-unfold' : 'menu-fold'" |
18 | - @click.native="toggle"/> | |
18 | + @click="toggle"/> | |
19 | 19 | |
20 | 20 | <span v-if="device === 'desktop'">欢迎进入 Jeecg-Boot 企业级快速开发平台</span> |
21 | 21 | <span v-else>Jeecg-Boot</span> |
... | ... | @@ -37,7 +37,7 @@ |
37 | 37 | v-else |
38 | 38 | class="trigger" |
39 | 39 | :type="collapsed ? 'menu-fold' : 'menu-unfold'" |
40 | - @click.native="toggle"></a-icon> | |
40 | + @click="toggle"></a-icon> | |
41 | 41 | </div> |
42 | 42 | <user-menu class="header-index-right" :theme="theme" :style="topMenuStyle.headerIndexRight"/> |
43 | 43 | </div> |
... | ... |
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
... | ... | @@ -20,7 +20,7 @@ |
20 | 20 | @change="searchMethods" |
21 | 21 | @blur="hiddenClick" |
22 | 22 | > |
23 | - <a-select-option v-for="site in searchMenuOptions" :value="site.id">{{site.meta.title}}</a-select-option> | |
23 | + <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option> | |
24 | 24 | </a-select> |
25 | 25 | </component> |
26 | 26 | <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件,在手机端呈现出弹出框 --> |
... | ... |
ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | </a-form-item> |
13 | 13 | </a-form> |
14 | 14 | <a-row type="flex" :gutter="8"> |
15 | - <a-col v-for="(str,index) of testValue"> | |
15 | + <a-col v-for="(str,index) of testValue" :key="index"> | |
16 | 16 | <a-row> |
17 | 17 | <a-col> |
18 | 18 | <a-input :value="str" style="text-align: center;width: 40px;"/> |
... | ... |
jeecg-boot/db/mysql_schema.sql renamed to jeecg-boot/db/1mysql_schema.sql
jeecg-boot/db/mysql5.7.sql renamed to jeecg-boot/db/2jeecgboot_mysql5.7.sql
jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql
1 | 1 | |
2 | - | |
3 | 2 | -- 多数据源表 |
4 | 3 | DROP TABLE IF EXISTS `sys_data_source`; |
5 | 4 | CREATE TABLE `sys_data_source` ( |
... | ... | @@ -27,14 +26,10 @@ INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `descri |
27 | 26 | INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1209733839933476865', '1209733563293962241', 'Oracle', '2', '', '1', '1', 'admin', '2019-12-25 151318', NULL, NULL); |
28 | 27 | INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1209733903020003330', '1209733563293962241', 'SQLServer', '3', '', '1', '1', 'admin', '2019-12-25 151333', NULL, NULL); |
29 | 28 | |
30 | - | |
31 | 29 | -- 生产销售监控 -- |
32 | -update sys_permission set url='{{ window._CONFIG['domianURL'] }}bigscreentemplatindex1' where id='1205098241075453953'; | |
30 | +update sys_permission set url='{{ window._CONFIG[\'domianURL\'] }}/big/screen/templat/index1' where id='1205098241075453953'; | |
33 | 31 | -- 智慧物流监控 -- |
34 | -update sys_permission set url='{{ window._CONFIG['domianURL'] }}bigscreentemplatindex2' where id='1205306106780364802'; | |
35 | - | |
36 | - | |
37 | - | |
32 | +update sys_permission set url='{{ window._CONFIG[\'domianURL\'] }}/big/screen/templat/index2' where id='1205306106780364802'; | |
38 | 33 | |
39 | 34 | |
40 | 35 | |
... | ... | @@ -137,5 +132,4 @@ update onl_cgform_head SET theme_template = 'normal'; |
137 | 132 | INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1229674163694841857', 'e41b69c57a941a3bbcce45032fe57605', 'AUTO在线表单ERP', 'onlinecgformErpListcode', 'modulesonlinecgformautoerpOnlCgformErpList', NULL, NULL, 1, NULL, '1', 5.00, 0, NULL, 1, 1, 0, 1, NULL, 'admin', '2020-02-18 154900', 'admin', '2020-02-18 155225', 0, 0, '1', 0); |
138 | 133 | |
139 | 134 | ALTER TABLE `onl_cgform_field` |
140 | -ADD COLUMN `is_read_only` tinyint(1) NULL DEFAULT 0 COMMENT '是否是只读(1是 0否)' AFTER `is_show_list`; | |
141 | - | |
135 | +ADD COLUMN `is_read_only` tinyint(1) NULL DEFAULT 0 COMMENT '是否是只读(1是 0否)' AFTER `is_show_list`; | |
142 | 136 | \ No newline at end of file |
... | ... |
jeecg-boot/db/增量升级SQL/版本升级
0 → 100644
1 | +版本升级方法? | |
2 | + | |
3 | + JeecgBoot属于平台级产品,每次升级改动内容较多,目前做不到平滑升级。 | |
4 | + | |
5 | + 这里给用户的升级建议是这样的: | |
6 | + 1.代码升级 => 本地版本通过svn或者git做好主干,在分支上做业务开发,jeecg每次版本发布,可以手工覆盖主干的代码,对比代码进行提交; | |
7 | + 2.数据库升级 => 针对数据库我们每次发布会提供增量升级SQL,可以通过增量SQL实现数据库的升级。 | |
8 | + 3.兼容问题 => 每次版本发布会针对不兼容地方标注说明,需要手工修改不兼容的代码。 | |
9 | + | |
10 | + 注意: 升级sql目前只提供mysql版本,执行完脚步后,新菜单需要手工进行角色授权,刷新首页才会出现。 | |
0 | 11 | \ No newline at end of file |
... | ... |