diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 5373a536..397f1862 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 1524 - 31 + 18 + 2101 128 128 @@ -1527,6 +1527,22 @@ file_size decimal(p) + + 91535d1fca32e48c6db699f421f606a7eede469a + 10 + null + false + null + false + false + false + + false + 排序（升序） + 文件排序（升序） + file_sort + decimal(p) + 474216e9f34d3d238da54689cd04d32e20a0a4bb 20 @@ -11769,350 +11785,6 @@ - - 0e046d64a970231cfcc17e4e5c4bc281c289072f - 360 - 470 - Segoe UI - 9 - 108 - 2412 - - 128 - 128 - 192 - - - - 0f456e961d9dc3f464fd9c847dea603f30ceb5d2 - ea4a1c367ad1a436305eb4c93d3d1f87ac140ba1 - 0e046d64a970231cfcc17e4e5c4bc281c289072f - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_file_upload - 文件上传表 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 71026cc36a892284987749f2f04c4f5b738353c1 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - fc44d466dd6009e48b5222d1d71e38d025194ff0 - 54b86f255d95078898534902087fb704b4265b60 - 0f456e961d9dc3f464fd9c847dea603f30ceb5d2 - - - - - varchar(n) - - - false - true - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7295c82faa1ac317a2e7b0e11fbc9b7f8a1bc1e4 - 10026ba39b384fa6e488e2777d16d4ac77f2c32f - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 474216e9f34d3d238da54689cd04d32e20a0a4bb - 466c16fcce3610b3418c8168beb22289be9636ec - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 667704664e4b88b145cebda0d6a1fbafb53525f0 - 3ecd22c0c0d34b181f09931a092d0a8de161bf15 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 4f9a5bc4fccb64cfc3a35f9209c9ce9bd044a6b9 - 9a3684fdb82233df73bc0aa62e2a6d4dad926c27 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - - - - false - true - idx_sys_file_biz_ft - - - - - 466c16fcce3610b3418c8168beb22289be9636ec - false - - - - - false - true - idx_sys_file_biz_fi - - - - - fc44d466dd6009e48b5222d1d71e38d025194ff0 - false - - - - - false - true - idx_sys_file_biz_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_file_biz_cb - - - - - c391a15752a8eb58bc558a39d1b431f7ee125e0e - false - - - - - false - true - idx_sys_file_biz_ud - - - - - f8ea4fc4a778a0b94398a661a1ed8608f0e8d28d - false - - - - - false - true - idx_sys_file_biz_bt - - - - - 9a3684fdb82233df73bc0aa62e2a6d4dad926c27 - false - - - - - false - true - idx_sys_file_biz_bk - - - - - 3ecd22c0c0d34b181f09931a092d0a8de161bf15 - false - - - - - - - - - -
0e0b69bca5b900242c3bb577c9757564e9a942f8412 @@ -16647,6 +16319,383 @@
+ + 0e046d64a970231cfcc17e4e5c4bc281c289072f + 360 + 470 + Segoe UI + 9 + 108 + 2412 + + 128 + 128 + 192 + + + + b03ed6e9f99023dd0f52f5e982f309bdec4ce4a6 + ea4a1c367ad1a436305eb4c93d3d1f87ac140ba1 + 0e046d64a970231cfcc17e4e5c4bc281c289072f + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_file_upload + 文件上传表 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 71026cc36a892284987749f2f04c4f5b738353c1 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + fc44d466dd6009e48b5222d1d71e38d025194ff0 + 54b86f255d95078898534902087fb704b4265b60 + b03ed6e9f99023dd0f52f5e982f309bdec4ce4a6 + + + + + varchar(n) + + + false + true + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7295c82faa1ac317a2e7b0e11fbc9b7f8a1bc1e4 + 10026ba39b384fa6e488e2777d16d4ac77f2c32f + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 474216e9f34d3d238da54689cd04d32e20a0a4bb + 466c16fcce3610b3418c8168beb22289be9636ec + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 91535d1fca32e48c6db699f421f606a7eede469a + f5d76e04be30a5d8d04611203aa57ae272827d59 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 667704664e4b88b145cebda0d6a1fbafb53525f0 + 3ecd22c0c0d34b181f09931a092d0a8de161bf15 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 4f9a5bc4fccb64cfc3a35f9209c9ce9bd044a6b9 + 9a3684fdb82233df73bc0aa62e2a6d4dad926c27 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + + + + false + true + idx_sys_file_biz_ft + + + + + 466c16fcce3610b3418c8168beb22289be9636ec + false + + + + + false + true + idx_sys_file_biz_fi + + + + + fc44d466dd6009e48b5222d1d71e38d025194ff0 + false + + + + + false + true + idx_sys_file_biz_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_file_biz_cb + + + + + c391a15752a8eb58bc558a39d1b431f7ee125e0e + false + + + + + false + true + idx_sys_file_biz_ud + + + + + f8ea4fc4a778a0b94398a661a1ed8608f0e8d28d + false + + + + + false + true + idx_sys_file_biz_bt + + + + + 9a3684fdb82233df73bc0aa62e2a6d4dad926c27 + false + + + + + false + true + idx_sys_file_biz_bk + + + + + 3ecd22c0c0d34b181f09931a092d0a8de161bf15 + false + + + + + + + + + +
diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.0.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.0.sql new file mode 100644 index 00000000..457774e7 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.0.sql @@ -0,0 +1,4 @@ + +-- 文件表增加排序字段 +ALTER TABLE `${_prefix}sys_file_upload` +ADD COLUMN `file_sort` decimal(10) NULL COMMENT '文件排序' AFTER `file_type`; diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index 23cd043e..3329c87b 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -12,4 +12,5 @@ 4.1.3 4.1.4 4.1.5 -4.1.6 \ No newline at end of file +4.1.6 +4.1.7.0 \ No newline at end of file diff --git a/modules/core/src/main/resources/views/include/jslibs.html b/modules/core/src/main/resources/views/include/jslibs.html index 00665888..95ce9909 100644 --- a/modules/core/src/main/resources/views/include/jslibs.html +++ b/modules/core/src/main/resources/views/include/jslibs.html @@ -34,6 +34,7 @@ + <% } %> <% if (@ListUtils.inString('ueditor', libs!)){ %>