github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

解决新版2.1.4 online表单插入行，添加报错问题

pull/1067/merge
zhangdaiscott 2020-02-24 17:48:23 +08:00
parent 1cabc94cea
commit 49a303d5e8
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ant-design-vue-jeecg/package.json
View File

@ -10,7 +10,7 @@
}, },
"dependencies": { "dependencies": {
"@antv/data-set": "^0.10.2", "@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", "@tinymce/tinymce-vue": "^2.0.0",
"ant-design-vue": "^1.4.0", "ant-design-vue": "^1.4.0",
"apexcharts": "^3.6.5", "apexcharts": "^3.6.5",

4
ant-design-vue-jeecg/src/views/modules/online/cgform/util/TableUtils.js
View File

@ -2,11 +2,11 @@
* 同步列表，可以同步新增、修改、删除 * 同步列表，可以同步新增、修改、删除
* @author sunjianlei * @author sunjianlei
* */ * */
export function syncAllTable(vm, table1) { export async function syncAllTable(vm, table1) {
vm.$refs.editableTable.resetScrollTop() vm.$refs.editableTable.resetScrollTop()
let deleteIds = table1.$refs.editableTable.getDeleteIds() let deleteIds = table1.$refs.editableTable.getDeleteIds()
let table1Value let table1Value
table1.$refs.editableTable.getValuesPromise(false).then((values) => { await table1.$refs.editableTable.getValuesPromise(false).then((values) => {
table1Value = values table1Value = values
return vm.$refs.editableTable.getValuesPromise(false) return vm.$refs.editableTable.getValuesPromise(false)
}).then((values) => { }).then((values) => {

8
ant-design-vue-jeecg/yarn.lock
View File

@ -863,10 +863,10 @@
cssnano-preset-default "^4.0.0" cssnano-preset-default "^4.0.0"
postcss "^7.0.0" postcss "^7.0.0"
"@jeecg/antd-online-214@^2.1.4": "@jeecg/antd-online-214@^2.1.41":
version "2.1.4" version "2.1.41"
resolved "https://registry.npmjs.org/@jeecg/antd-online-214/-/antd-online-214-2.1.4.tgz#981dae8ff2ab75367fbd4aef63d5a676132ade00" resolved "https://registry.npmjs.org/@jeecg/antd-online-214/-/antd-online-214-2.1.41.tgz#d74847558b87b590202ed3f3f2223d6388896e5b"
integrity sha512-1gtZTHvUnFUpH2AB5FzuGvYHhPMhEfhk8bf838AtxOHUl/jQBF/sHpl7fDbvKKjHNpRAIrKmUDzWk6WboStr1A== integrity sha512-kC9Td7Er2lq71ZsYuXFMI/qvUCvUEQxPsqJX2FwPE8VV2GmegXtluNTCi7EuU+j6hxismhKl+AkNIiC06xQh5Q==
"@mrmlnc/readdir-enhanced@^2.2.1": "@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1" version "2.2.1"

2
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
View File

@ -96,7 +96,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource: datasource:
master: 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 username: root
password: root password: root
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver

2
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
View File

@ -96,7 +96,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource: datasource:
master: 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 username: root
password: root password: root
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver

2
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
View File

@ -96,7 +96,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource: datasource:
master: 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 username: root
password: root password: root
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver

1
jeecg-boot/pom.xml
View File

@ -207,7 +207,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- online form-->
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-re</artifactId> <artifactId>hibernate-re</artifactId>