diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json
index 92a4afe..993b1dd 100644
--- a/ant-design-vue-jeecg/package.json
+++ b/ant-design-vue-jeecg/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@antv/data-set": "^0.10.2",
- "@jeecg/antd-online-214": "^2.1.4",
+ "@jeecg/antd-online-214": "^2.1.41",
"@tinymce/tinymce-vue": "^2.0.0",
"ant-design-vue": "^1.4.0",
"apexcharts": "^3.6.5",
diff --git a/ant-design-vue-jeecg/src/views/modules/online/cgform/util/TableUtils.js b/ant-design-vue-jeecg/src/views/modules/online/cgform/util/TableUtils.js
index 5d6cfc1..cccca01 100644
--- a/ant-design-vue-jeecg/src/views/modules/online/cgform/util/TableUtils.js
+++ b/ant-design-vue-jeecg/src/views/modules/online/cgform/util/TableUtils.js
@@ -2,11 +2,11 @@
* 同步列表，可以同步新增、修改、删除
* @author sunjianlei
* */
-export function syncAllTable(vm, table1) {
+export async function syncAllTable(vm, table1) {
vm.$refs.editableTable.resetScrollTop()
let deleteIds = table1.$refs.editableTable.getDeleteIds()
let table1Value
- table1.$refs.editableTable.getValuesPromise(false).then((values) => {
+ await table1.$refs.editableTable.getValuesPromise(false).then((values) => {
table1Value = values
return vm.$refs.editableTable.getValuesPromise(false)
}).then((values) => {
diff --git a/ant-design-vue-jeecg/yarn.lock b/ant-design-vue-jeecg/yarn.lock
index a9daafc..dd5ceb4 100644
--- a/ant-design-vue-jeecg/yarn.lock
+++ b/ant-design-vue-jeecg/yarn.lock
@@ -863,10 +863,10 @@
cssnano-preset-default "^4.0.0"
postcss "^7.0.0"
-"@jeecg/antd-online-214@^2.1.4":
- version "2.1.4"
- resolved "https://registry.npmjs.org/@jeecg/antd-online-214/-/antd-online-214-2.1.4.tgz#981dae8ff2ab75367fbd4aef63d5a676132ade00"
- integrity sha512-1gtZTHvUnFUpH2AB5FzuGvYHhPMhEfhk8bf838AtxOHUl/jQBF/sHpl7fDbvKKjHNpRAIrKmUDzWk6WboStr1A==
+"@jeecg/antd-online-214@^2.1.41":
+ version "2.1.41"
+ resolved "https://registry.npmjs.org/@jeecg/antd-online-214/-/antd-online-214-2.1.41.tgz#d74847558b87b590202ed3f3f2223d6388896e5b"
+ integrity sha512-kC9Td7Er2lq71ZsYuXFMI/qvUCvUEQxPsqJX2FwPE8VV2GmegXtluNTCi7EuU+j6hxismhKl+AkNIiC06xQh5Q==
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
diff --git a/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql b/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql
index 2fcb345..4be45b9 100644
--- a/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql
+++ b/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql
@@ -49,8 +49,7 @@ ADD COLUMN `bus_id` varchar(50) COMMENT '业务id' AFTER `bus_type`,
ADD COLUMN `open_type` varchar(20) COMMENT '打开方式(组件：component 路由：url)' AFTER `bus_id`,
ADD COLUMN `open_page` varchar(255) COMMENT '组件路由 地址' AFTER `open_type`;
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1209731624921534465', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '多数据源管理', 'isystemdataSource', 'systemSysDataSourceList', '1', NULL, NULL, '1', NULL, '1', '3', '0', NULL, '1', '0', '0', NULL, 'admin', '2019-12-25 150430', NULL, NULL, '0', '0', '1', '0');
-
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1209731624921534465', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '多数据源管理', '/isystem/dataSource', 'system/SysDataSourceList', '1', NULL, NULL, '1', NULL, '1', '3', '0', NULL, '1', '0', '0', NULL, 'admin', '2019-12-25 15:04:30', NULL, NULL, '0', '0', '1', '0');
ALTER TABLE `sys_data_source`
ADD COLUMN `code` varchar(100) NULL COMMENT '数据源编码' AFTER `id`;
@@ -79,7 +78,7 @@ INSERT INTO `sys_check_rule` VALUES ('1224980593992388610', '通用编码规则'
INSERT INTO `sys_check_rule` VALUES ('1225001845524004866', '负责的功能测试', 'test', '[{digits,pattern^.{3,12}$,message只能输入3-12位字符},{digits3,pattern^d{3}$,message前3位必须是数字},{digits,pattern^[^pP]$,message不能输入P},{digits4,pattern^@{4}$,message第4-7位必须都为 @},{digits2,pattern^#=$,message第8-9位必须是 #=},{digits1,pattern^O$,message第10位必须为大写的O},{digits,pattern^.。$,message必须以。结尾}]', '包含长度校验、特殊字符校验等', 'admin', '2020-02-07 115731', 'admin', '2020-02-05 182254');
-- 编码校验规则菜单
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1224641973866467330', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '编码校验规则', 'isystemcheckRule', 'systemSysCheckRuleList', '1', NULL, NULL, '1', NULL, '1', '2', '0', NULL, '1', '0', '0', NULL, 'admin', '2019-11-07 135253', NULL, NULL, '0', '0', '1', '0');
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1224641973866467330', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '编码校验规则', '/isystem/checkRule', 'system/SysCheckRuleList', '1', NULL, NULL, '1', NULL, '1', '2', '0', NULL, '1', '0', '0', NULL, 'admin', '2019-11-07 13:52:53', NULL, NULL, '0', '0', '1', '0');
DROP TABLE IF EXISTS `sys_depart_permission`;
CREATE TABLE `sys_depart_permission` (
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
index 6880d16..a404698 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -96,7 +96,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false
username: root
password: root
driver-class-name: com.mysql.jdbc.Driver
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
index ae58e0c..d9ea2f0 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
@@ -96,7 +96,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false
username: root
password: root
driver-class-name: com.mysql.jdbc.Driver
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
index 4696574..17b810c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
@@ -96,7 +96,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false
username: root
password: root
driver-class-name: com.mysql.jdbc.Driver
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index dddab8f..a0ef2e0 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -207,7 +207,6 @@
</exclusions>
</dependency>
- <!-- online form-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-re</artifactId>