From cdca94f980af38bf17c0eef8cc32c040d91320cf Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 1 Aug 2019 11:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 824 +++++++++--------- .../db/upgrade/core/mysql/mysql_4.1.6.sql | 23 + .../views/modules/sys/sysDesktop.html | 2 +- 3 files changed, 453 insertions(+), 396 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 05986e77..e675c3a2 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 0 - 0 + 1344 + 480 128 128 @@ -295,6 +295,22 @@ biz_key varchar(n) + + 9c7b6cb6e8190ee30301f5046f6caceb0d9914d0 + 255 + null + false + null + false + false + false + + false + + 适应业务范围（不同的功能，不同的数据权限支持） + biz_scope + varchar(n) + 4f9a5bc4fccb64cfc3a35f9209c9ce9bd044a6b9 64 @@ -1671,22 +1687,6 @@ id varchar(n) - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 64 - null - false - null - false - false - false - - false - - 编号 - id - varchar(n) - f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f 64 @@ -3996,13 +3996,13 @@ - 9f69f945b947ae518dad9760256b2031cb8101a7 + cb48c1cac141bb138bedb45c67fcae800e7e2767100319Segoe UI9 - 1712 - 132 + 1704 + 83 128 128 @@ -4010,9 +4010,9 @@ - db36052a12146605fe630aac0971333bad903e63 - 9e3276f91563733b191509e7a49960e488e20adf - 9f69f945b947ae518dad9760256b2031cb8101a7 + 5c34d5d569f4c3e91ad429ffae21f6c8cde6e701 + f6a8962b7fcb6101a25612849c208419604d342c + cb48c1cac141bb138bedb45c67fcae800e7e2767 -1 -1 -1 @@ -4032,9 +4032,9 @@ null - 54fc13546ad7110b08cb4b80efd68d0a7b808943 + 73078c6c0fb5f54142878da20e15be4ba532c23b 0ded13a505cc3bfde24edfbae369231be192a59b - 9f69f945b947ae518dad9760256b2031cb8101a7 + cb48c1cac141bb138bedb45c67fcae800e7e2767 -1 -1 -1 @@ -4064,7 +4064,7 @@ 537ed3a5e139d1fed26b9011d93c339510cda1f7 e59481cc0025d4da3d55201ee470c33b2c12a575 - 54fc13546ad7110b08cb4b80efd68d0a7b808943 + 73078c6c0fb5f54142878da20e15be4ba532c23b @@ -4098,7 +4098,7 @@ ffde396c7b349d700fe1b7891694ac538d00bf6d 22d38cfee95536d3e3af5fdd444b027a85d95432 - db36052a12146605fe630aac0971333bad903e63 + 5c34d5d569f4c3e91ad429ffae21f6c8cde6e701 @@ -4139,13 +4139,13 @@
- 233f59a885abe6fa70ee302b70fd5212d2c74548 + a164a0a63e52dfc0ae2ebd2165cb1d846c9783d1152352Segoe UI9 - 1631 - 1229 + 1608 + 1503 128 128 @@ -4153,9 +4153,9 @@ - 2fb5b40d9c2a7b9b491ffe6321c354bdf596660f + a52080b1f696ae2b0c542a9a2e6814e01289a9bf 0ded13a505cc3bfde24edfbae369231be192a59b - 233f59a885abe6fa70ee302b70fd5212d2c74548 + a164a0a63e52dfc0ae2ebd2165cb1d846c9783d1 -1 -1 -1 @@ -4185,7 +4185,7 @@ 0d5ebb11e5172fb4a9e1b4b2e62140432e0cd3ff e59481cc0025d4da3d55201ee470c33b2c12a575 - 2fb5b40d9c2a7b9b491ffe6321c354bdf596660f + a52080b1f696ae2b0c542a9a2e6814e01289a9bf 控制用户编码 @@ -4772,322 +4772,6 @@
- - 9e3276f91563733b191509e7a49960e488e20adf - 438 - 362 - Segoe UI - 9 - 1630 - 445 - - 128 - 128 - 192 - - - - js_sys_role - 角色表 - - - - - - - 0939f982d8d703b2e27b802da88b1ba1eeb11c63 - 22d38cfee95536d3e3af5fdd444b027a85d95432 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - bf04028c4beab99e1c35c6a22ffa6f9b745a49f5 - ecf6453361ea95112d99a48d499d245033596daf - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 261201b437ac0f92fe52da10902425f2391f0fa8 - 6bd0ef3540d4ec60b76dcbf8202a929fabb20f1b - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f7482b471418bdd790ae93233367f1d6315506ed - 1033b538c81cfc078c51eca175cf765d88459b30 - - - - - decimal(p) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7feb27963741f108bd29ccf401a0f25ec6f588ff - 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b395e79cb48e870a827a4ea6436f7d00c2f18111 - 86b833a3be962a3cd6e79502f72d48b455bf247d - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1b0f1b3a4e3073d84bc2c8406195d3eaa5276c19 - 00a708c89cdb80f2a937084230260e35dc689c4b - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - - - - false - true - idx_sys_role_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_role_is - - - - - 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 - false - - - - - false - true - idx_sys_role_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_role_rs - - - - - 1033b538c81cfc078c51eca175cf765d88459b30 - false - - - - - - - - - -
fe9991829b27dafb45a95e13b6e9dd724b3bf424308 @@ -5312,13 +4996,13 @@
- f10bd927f4651e79dbe30cb0fecaeaeb8ec18ac4 + a1303ae2ba44af053708a3742aee02836c407c3d1218617Segoe UI9 - 2208 - 12 + 2280 + 36 128 128 @@ -10154,13 +9838,13 @@
- 69313ab5c2071b73eea41f10fed64f3aac14c433 + 08fbafe09b62772cf1c9f93979c41d74b3809b1f1166387Segoe UI9 - 3384 - 0 + 3408 + 24 128 128 @@ -10168,9 +9852,9 @@ - 6f11841abab212a1e0da297f943061839f658e92 - b4d84e433bcd526d3728138bfd310c427c16177e - 69313ab5c2071b73eea41f10fed64f3aac14c433 + 785e64ffc31f738c05eb6a39ebf3a311929f5bef + baa54d8a660b4fa684a97d8dd288d1edcf52ec5a + 08fbafe09b62772cf1c9f93979c41d74b3809b1f -1 -1 -1 @@ -10300,7 +9984,7 @@ 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 4f8af0766a0ba0866db74d9fe750581d1eefea91 - 6f11841abab212a1e0da297f943061839f658e92 + 785e64ffc31f738c05eb6a39ebf3a311929f5bef @@ -10580,13 +10264,13 @@
- 58be1ca8c00baf293ef16f69d782da2b79da6ec2 + 3674020785393b0615fba55ad49015a88e83da12152352Segoe UI9 - 1664 - 984 + 2033 + 1536 128 128 @@ -10594,9 +10278,9 @@ - e5bf008ae60e65758152ac2c554dd55b259e2a74 - 9e3276f91563733b191509e7a49960e488e20adf - 58be1ca8c00baf293ef16f69d782da2b79da6ec2 + 53629fb1290a031fd6a1bb067fd1ba50ec6586de + f6a8962b7fcb6101a25612849c208419604d342c + 3674020785393b0615fba55ad49015a88e83da12 -1 -1 -1 @@ -10626,7 +10310,7 @@ 7e2f59707205419c8556876dc854aeff0fbf7b57 22d38cfee95536d3e3af5fdd444b027a85d95432 - e5bf008ae60e65758152ac2c554dd55b259e2a74 + 53629fb1290a031fd6a1bb067fd1ba50ec6586de 控制角色编码 @@ -10963,13 +10647,13 @@
- 2692f98d54cb6b15c3c537e3fda8eedf24bc9e19 + 3c87a1572923924d481891ca9d1a09451008cef5100321Segoe UI9 - 2064 - 1296 + 2292 + 1404 128 128 @@ -10977,9 +10661,9 @@ - cbde37ca64bc9ba898ee5f83f212c7f3163cdf5a - f10bd927f4651e79dbe30cb0fecaeaeb8ec18ac4 - 2692f98d54cb6b15c3c537e3fda8eedf24bc9e19 + b180aa0bd8132f139ea09b1d4d2b9594f19a007f + a1303ae2ba44af053708a3742aee02836c407c3d + 3c87a1572923924d481891ca9d1a09451008cef5 -1 -1 -1 @@ -10999,9 +10683,9 @@ null - 4ab8e53cf736d166db3f610124df5a47fa534875 - 9e3276f91563733b191509e7a49960e488e20adf - 2692f98d54cb6b15c3c537e3fda8eedf24bc9e19 + c4082c0b632d11a39c0aa770bf2e10a63143eab5 + f6a8962b7fcb6101a25612849c208419604d342c + 3c87a1572923924d481891ca9d1a09451008cef5 -1 -1 -1 @@ -11031,7 +10715,7 @@ 136c2841a88ba120cd1f0bb13f7ba446474de69e 22d38cfee95536d3e3af5fdd444b027a85d95432 - 4ab8e53cf736d166db3f610124df5a47fa534875 + c4082c0b632d11a39c0aa770bf2e10a63143eab5 @@ -11065,7 +10749,7 @@ 1882f53a36409270c8622486740876fcb2af9842 e84c40cdf5ffdb2ba4d59630d98abb5972d74795 - cbde37ca64bc9ba898ee5f83f212c7f3163cdf5a + b180aa0bd8132f139ea09b1d4d2b9594f19a007f @@ -11987,13 +11671,13 @@
- 07cb8651a5bc8535cc5e6e0e59001d4a38d0656b + 782b92987c27592a00cf1568e6690a1e81cf8b8a360383Segoe UI9 - 2904 - 445 + 2952 + 468 128 128 @@ -12230,12 +11914,12 @@
- b4d84e433bcd526d3728138bfd310c427c16177e + baa54d8a660b4fa684a97d8dd288d1edcf52ec5a308383Segoe UI9 - 2904 + 295236 128 @@ -12420,13 +12104,13 @@
- 026c6593a326aa8278c92ff8df151ad1fcd88617 + 0183c6d48cf94f7a33a297f161560e906cc28f14308336Segoe UI9 - 2928 - 900 + 2963 + 912 128 128 @@ -15099,13 +14783,13 @@
- 184cbda2e2693ec9cbf8d7c956f5c30e688d63b6 + c58a967b7958dfa2351079a5cf55aa97da99ae82568449Segoe UI9 - 1632 - 1548 + 1620 + 1716 128 128 @@ -15639,13 +15323,13 @@
- 16ab31bb1c94703714c4fcd4d247aa6a0f8f48d1 + 28d6a068ed90b37e3f2ccb30d9c0bd332591bce4542346Segoe UI92220 - 1548 + 1729 128 128 @@ -15653,9 +15337,9 @@ - 7a17c1a24e1e40b3fb1b7d51d0eb3695b7823602 - 184cbda2e2693ec9cbf8d7c956f5c30e688d63b6 - 16ab31bb1c94703714c4fcd4d247aa6a0f8f48d1 + 13d5d16ad388cc5aa4c3a6c57b1088ee84f7dbd1 + c58a967b7958dfa2351079a5cf55aa97da99ae82 + 28d6a068ed90b37e3f2ccb30d9c0bd332591bce4 -1 -1 -1 @@ -15718,7 +15402,7 @@ abd5fc5f0bb213daae3de2abc362c5aea5276f4d a3c67705fc3d118ba46b7f57c9b24fbf0505d7b9 - 7a17c1a24e1e40b3fb1b7d51d0eb3695b7823602 + 13d5d16ad388cc5aa4c3a6c57b1088ee84f7dbd1 @@ -16564,6 +16248,356 @@
+ + f6a8962b7fcb6101a25612849c208419604d342c + 984 + 586 + Segoe UI + 9 + 1656 + 384 + + 128 + 128 + 192 + + + + js_sys_role + 角色表 + + + + + + + 0939f982d8d703b2e27b802da88b1ba1eeb11c63 + 22d38cfee95536d3e3af5fdd444b027a85d95432 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + bf04028c4beab99e1c35c6a22ffa6f9b745a49f5 + ecf6453361ea95112d99a48d499d245033596daf + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 261201b437ac0f92fe52da10902425f2391f0fa8 + 6bd0ef3540d4ec60b76dcbf8202a929fabb20f1b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f7482b471418bdd790ae93233367f1d6315506ed + 1033b538c81cfc078c51eca175cf765d88459b30 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7feb27963741f108bd29ccf401a0f25ec6f588ff + 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b395e79cb48e870a827a4ea6436f7d00c2f18111 + 86b833a3be962a3cd6e79502f72d48b455bf247d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1b0f1b3a4e3073d84bc2c8406195d3eaa5276c19 + 00a708c89cdb80f2a937084230260e35dc689c4b + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 9c7b6cb6e8190ee30301f5046f6caceb0d9914d0 + ca48faffcf40d18afd892ce5378f1b17aa5eb785 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_role_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_role_is + + + + + 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 + false + + + + + false + true + idx_sys_role_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_role_rs + + + + + 1033b538c81cfc078c51eca175cf765d88459b30 + false + + + + + + + + + +
diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql index 9d0f10b4..606a6853 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql @@ -8,3 +8,26 @@ INSERT INTO `${_prefix}sys_dict_type`(`id`, `dict_name`, `dict_type`, `is_sys`, VALUES ('1149344200121085952', '角色业务范围', 'sys_role_biz_scope', '1', '0', 'system', now(), 'system', now(), ''); INSERT INTO `${_prefix}sys_dict_data`(`dict_code`, `parent_code`, `parent_codes`, `tree_sort`, `tree_sorts`, `tree_leaf`, `tree_level`, `tree_names`, `dict_label`, `dict_value`, `dict_type`, `is_sys`, `description`, `css_style`, `css_class`, `status`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `corp_code`, `corp_name`, `extend_s1`, `extend_s2`, `extend_s3`, `extend_s4`, `extend_s5`, `extend_s6`, `extend_s7`, `extend_s8`, `extend_i1`, `extend_i2`, `extend_i3`, `extend_i4`, `extend_f1`, `extend_f2`, `extend_f3`, `extend_f4`, `extend_d1`, `extend_d2`, `extend_d3`, `extend_d4`) VALUES ('1149344606834356224', '0', '0,', 30, '0000000030,', '1', 0, '组织管理', '组织管理', 'office_user', 'sys_role_biz_scope', '1', '', '', '', '0', 'system', now(), 'system', now(), '', '0', 'JeeSite', '', '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +-- 角色表增加扩展字段 +ALTER TABLE `${_prefix}sys_role` +ADD COLUMN extend_s1 varchar(500) COMMENT '扩展 String 1', +ADD COLUMN extend_s2 varchar(500) COMMENT '扩展 String 2', +ADD COLUMN extend_s3 varchar(500) COMMENT '扩展 String 3', +ADD COLUMN extend_s4 varchar(500) COMMENT '扩展 String 4', +ADD COLUMN extend_s5 varchar(500) COMMENT '扩展 String 5', +ADD COLUMN extend_s6 varchar(500) COMMENT '扩展 String 6', +ADD COLUMN extend_s7 varchar(500) COMMENT '扩展 String 7', +ADD COLUMN extend_s8 varchar(500) COMMENT '扩展 String 8', +ADD COLUMN extend_i1 decimal(19) COMMENT '扩展 Integer 1', +ADD COLUMN extend_i2 decimal(19) COMMENT '扩展 Integer 2', +ADD COLUMN extend_i3 decimal(19) COMMENT '扩展 Integer 3', +ADD COLUMN extend_i4 decimal(19) COMMENT '扩展 Integer 4', +ADD COLUMN extend_f1 decimal(19,4) COMMENT '扩展 Float 1', +ADD COLUMN extend_f2 decimal(19,4) COMMENT '扩展 Float 2', +ADD COLUMN extend_f3 decimal(19,4) COMMENT '扩展 Float 3', +ADD COLUMN extend_f4 decimal(19,4) COMMENT '扩展 Float 4', +ADD COLUMN extend_d1 datetime COMMENT '扩展 Date 1', +ADD COLUMN extend_d2 datetime COMMENT '扩展 Date 2', +ADD COLUMN extend_d3 datetime COMMENT '扩展 Date 3', +ADD COLUMN extend_d4 datetime COMMENT '扩展 Date 4'; diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html index 3d480108..8f64fd27 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html +++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html @@ -110,7 +110,7 @@ type : 'value' } ], - color: ['#FAD860','#F3A43B','#60C0DD','#C6E579'], + //color: ['#FAD860','#F3A43B','#60C0DD','#C6E579'], series : [ { name:'成交',