diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json
index 9c0af7e9bdc6fe21cef5da1a45f646b26822c9f3..d40893e1b8c84e8638d9b81e3319a03f8efaa17c 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": "^1.2.0",
+ "@jeecg/antd-online": "1.2.0",
"@tinymce/tinymce-vue": "^2.0.0",
"ant-design-vue": "^1.4.0",
"apexcharts": "^3.6.5",
diff --git a/ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue b/ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
index 057e6fc02245e8c2a2362035f2865b7095c4ed13..fe5eb5cf14449b125b09ece11c21fdde1d78d88a 100644
--- a/ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
+++ b/ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
@@ -32,15 +32,23 @@
tagType:""
}
},
+ watch:{
+ dictCode:{
+ immediate:true,
+ handler() {
+ this.initDictData()
+ },
+ }
+ },
created() {
- console.log(this.dictCode);
+ // console.log(this.dictCode);
if(!this.type || this.type==="list"){
this.tagType = "select"
}else{
this.tagType = this.type
}
//获取字典数据
- this.initDictData();
+ // this.initDictData();
},
methods: {
initDictData() {
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue b/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
index a91b6ebf2d874fb9c2796ed171bae762d01fd618..c240b7e3263fef11b86293eb7f299eae4827f44b 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
@@ -43,7 +43,7 @@
- {{ f.text }}
+ {{ f.text }}
@@ -63,8 +63,9 @@
-
-
+
+
+
@@ -117,8 +118,14 @@
name: 'JSuperQuery',
components: { JDate },
props: {
- /* fieldList:[{value:'',text:'',type:''}]
- * type:date datetime int number string
+ /*
+ fieldList: [{
+ value:'',
+ text:'',
+ type:'',
+ dictCode:'' // 只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+ }]
+ type:date datetime int number string
* */
fieldList: {
type: Array,
@@ -213,7 +220,11 @@
this.queryParamsModel.splice(index, 1)
},
handleSelected(option, item) {
- item['type'] = option.data.attrs['data-type']
+ let index = option.data.attrs['data-idx']
+
+ let { type, dictCode } = this.fieldList[index]
+ item['type'] = type
+ item['dictCode'] = dictCode
},
handleReset() {
this.queryParamsModel = [{}]
diff --git a/ant-design-vue-jeecg/src/router/index.js b/ant-design-vue-jeecg/src/router/index.js
index bdbe374010600d2c5ea3ead59f5cc756b8cd5385..d65366aae742a6c0abadd17cda123bed44f5acfc 100644
--- a/ant-design-vue-jeecg/src/router/index.js
+++ b/ant-design-vue-jeecg/src/router/index.js
@@ -2,6 +2,11 @@ import Vue from 'vue'
import Router from 'vue-router'
import { constantRouterMap } from '@/config/router.config'
+const originalPush = Router.prototype.push
+Router.prototype.push = function push(location) {
+ return originalPush.call(this, location).catch(err => err)
+}
+
Vue.use(Router)
export default new Router({
diff --git a/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformCopyList.vue b/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformCopyList.vue
index 127452a859895c4c240c0ba8aede3682a3b5d825..bfe9249f799eb728f56e53e9813fd03efd026fcd 100644
--- a/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformCopyList.vue
+++ b/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformCopyList.vue
@@ -129,7 +129,6 @@
import Clipboard from 'clipboard'
import { filterObj } from '@/utils/util';
-
export default {
name: 'OnlCgformHeadList',
mixins: [JeecgListMixin],
diff --git a/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue b/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue
index 4149ec547302b0483d02a9519ba6c98cc9d1ade4..03661d98b8c90487cbed3bd35df860ab20952141 100644
--- a/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue
+++ b/ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue
@@ -177,14 +177,13 @@
import JDictSelectTag from '../../../../components/dict/JDictSelectTag.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import Clipboard from 'clipboard'
-
import { filterObj } from '@/utils/util';
export default {
name: 'OnlCgformHeadList',
mixins: [JeecgListMixin],
components: {
- JDictSelectTag,
+ JDictSelectTag
},
data() {
return {
diff --git a/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue b/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
index c3b5428f9e6be84409bd9aab2f7e70c6c46e6b46..37e54fef6435712b54e41408d1553334db885e7f 100644
--- a/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
+++ b/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
@@ -179,7 +179,7 @@
-
+
diff --git a/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue b/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue
index b068958ddb6bf6b9450622810dece79b30d48f68..4f433314ec91287781d191f862fc05712708f865 100644
--- a/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue
+++ b/ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue
@@ -128,7 +128,7 @@
-
+
diff --git a/jeecg-boot/jeecg-boot-base-common/.gitattributes b/jeecg-boot/.gitattributes
similarity index 100%
rename from jeecg-boot/jeecg-boot-base-common/.gitattributes
rename to jeecg-boot/.gitattributes
diff --git a/jeecg-boot/jeecg-boot-module-system/.gitattributes b/jeecg-boot/jeecg-boot-module-system/.gitattributes
deleted file mode 100644
index d479839ef107b158c095ef7c863983071888aca9..0000000000000000000000000000000000000000
--- a/jeecg-boot/jeecg-boot-module-system/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-*.js linguist-language=Java
-*.css linguist-language=Java
-*.html linguist-language=Java
-*.vue linguist-language=Java