diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 92a4afe3d99dc72bfd48a8e050c12158569ed764..993b1dda4896ca09a5c63a0456fe0c0cd007c600 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 5d6cfc1bdaaf2709603bc74f2067f6d0968e73e0..cccca0177129b7629345581a24665ec18864d479 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 a9daafcdfc43efa0964107da4a2a551bd8c57f34..dd5ceb4796ef6263b22fc2d69622b5600d55c90e 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/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml index 6880d165462e7a789c67c9b2a34b714dd515ecaf..a40469824a44243ef0de0ef16cca50897bd28f39 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 ae58e0cc79df00ed02359950cba8c180f278716c..d9ea2f07dab6ce3051fd35be0c7a972a54379dcb 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 46965749510d026eafa9e2fefc0ad0edaf40965c..17b810c5b2c71a4c329defdf3634a044539eab20 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 dddab8f12af18a84fb1916a315ff211a5d1a6ca3..a0ef2e0615fdee97349dd9453005e476f3d7eb34 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -207,7 +207,6 @@ - org.hibernate hibernate-re