From 49a303d5e83e8e40916c6f822ef81490f4411edb Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Mon, 24 Feb 2020 17:48:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E7=89=882.1.4=20onl?= =?UTF-8?q?ine=E8=A1=A8=E5=8D=95=E6=8F=92=E5=85=A5=E8=A1=8C=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/package.json | 2 +- .../src/views/modules/online/cgform/util/TableUtils.js | 4 ++-- ant-design-vue-jeecg/yarn.lock | 8 ++++---- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- jeecg-boot/pom.xml | 1 - 7 files changed, 10 insertions(+), 11 deletions(-) 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/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 @@ - org.hibernate hibernate-re -- GitLab