From 9c6f68fd4a6ee59f232c65c1a2021335de32db34 Mon Sep 17 00:00:00 2001 From: zhangdaihao Date: Sat, 19 Oct 2019 15:44:19 +0800 Subject: [PATCH] =?UTF-8?q?JeecgBoot=202.1.1=20=E7=89=88=E6=9C=AC=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/package.json | 2 +- .../src/components/dict/JDictSelectTag.vue | 12 ++++++++-- .../src/components/jeecg/JSuperQuery.vue | 23 ++++++++++++++----- ant-design-vue-jeecg/src/router/index.js | 5 ++++ .../online/cgform/OnlCgformCopyList.vue | 1 - .../online/cgform/OnlCgformHeadList.vue | 3 +-- .../online/cgform/auto/OnlCgformAutoList.vue | 2 +- .../online/cgform/auto/OnlCgformTreeList.vue | 2 +- .../.gitattributes | 0 .../jeecg-boot-module-system/.gitattributes | 4 ---- 10 files changed, 36 insertions(+), 18 deletions(-) rename jeecg-boot/{jeecg-boot-base-common => }/.gitattributes (100%) delete mode 100644 jeecg-boot/jeecg-boot-module-system/.gitattributes diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 9c0af7e9..d40893e1 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 057e6fc0..fe5eb5cf 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 a91b6ebf..c240b7e3 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 bdbe3740..d65366aa 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 127452a8..bfe9249f 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 4149ec54..03661d98 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 c3b5428f..37e54fef 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 b068958d..4f433314 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 d479839e..00000000 --- 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