diff --git a/src/api/mdp_pub/mdp_config.js b/src/api/mdp_pub/mdp_config.js index 722f76a..cee6e2c 100644 --- a/src/api/mdp_pub/mdp_config.js +++ b/src/api/mdp_pub/mdp_config.js @@ -134,6 +134,9 @@ export default { */ getSupportComponents:function(){ return ['myFocus'] + }, + getOpenSourceLink:function(){ + return "https://gitee.com/qingqinkj218/collections/375320" } } diff --git a/src/components/mdp-ui-ext/mdp-expand/FormData.vue b/src/components/mdp-ui-ext/mdp-expand/FormData.vue index 1d31a11..863f63a 100644 --- a/src/components/mdp-ui-ext/mdp-expand/FormData.vue +++ b/src/components/mdp-ui-ext/mdp-expand/FormData.vue @@ -127,7 +127,7 @@ import treeTool from '@/components/mdp-ui/js/treeTool.js' editSubmit: function () { this.$refs.editForm.validate((valid) => { if (valid) { - debugger + this.editLoading = true; let params = Object.assign({}, this.editForm); if(this.isExtInfosCpd){ diff --git a/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue b/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue index e137bbb..70d3828 100644 --- a/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue +++ b/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue @@ -208,7 +208,7 @@ }, onFieldChange(val){ - debugger; + this.$emit('input',this.editForm) this.$emit('change',this.editForm,this.field) diff --git a/src/components/mdp-ui-ext/mdp-image/Index.vue b/src/components/mdp-ui-ext/mdp-image/Index.vue index 9de312a..cd071eb 100644 --- a/src/components/mdp-ui-ext/mdp-image/Index.vue +++ b/src/components/mdp-ui-ext/mdp-image/Index.vue @@ -149,7 +149,7 @@ export default { } }, initCurrData(){ - debugger + var val=this.value if(!val){ this.myVal=val diff --git a/src/components/mdp-ui-ext/mdp-select-tag/TagSelect.vue b/src/components/mdp-ui-ext/mdp-select-tag/TagSelect.vue index bbbfc9a..70b1d3e 100644 --- a/src/components/mdp-ui-ext/mdp-select-tag/TagSelect.vue +++ b/src/components/mdp-ui-ext/mdp-select-tag/TagSelect.vue @@ -139,7 +139,7 @@ data() { methods: { //页面初始化需要配置的特殊逻辑写这里 initCurrData(){ - debugger + this.searchTableDatas(); }, diff --git a/src/components/mdp-ui/index.scss b/src/components/mdp-ui/index.scss index 39c4c40..69d3935 100644 --- a/src/components/mdp-ui/index.scss +++ b/src/components/mdp-ui/index.scss @@ -11,11 +11,9 @@ .field-info { align-items: center; - display:inline-flex; - margin-left: 10px; + display:inline-flex; } - .field-oper { - margin-left: 5px; + .field-oper { margin-right: 5px; display: none; } @@ -35,8 +33,7 @@ background-color: #ff9f73; } - .field-info { - margin-left: 10px; + .field-info { display:inline-flex; align-items: center; align-content: center; @@ -50,8 +47,7 @@ color: #c0c4cc; } } - .field-oper { - margin-left: 5px; + .field-oper { margin-right: 5px; display: none; } @@ -99,11 +95,8 @@ display: inline; } -.dashed-circle { - width: 40px; - height: 40px; - border: 2px dashed #000000; - border-radius: 40px/40px; +.dashed-circle { + border: 2px dashed #000000; } .field-box:hover .dashed-circle { border: 2px dashed #409eff; diff --git a/src/components/mdp-ui/js/util.js b/src/components/mdp-ui/js/util.js index 30faa93..ccecdd2 100644 --- a/src/components/mdp-ui/js/util.js +++ b/src/components/mdp-ui/js/util.js @@ -398,5 +398,46 @@ export default { // 防止反复添加 if(!document.getElementById(id)) document.body.appendChild(a); a.click(); - } + }, + + calcMaxHeight:function(cssSelector) { + + var table=cssSelector; + if(typeof cssSelector == 'string'){ + table=document.querySelector(cssSelector); + } + var innerHeight=window.innerHeight + var top=150; + + + if(table!=null){ + var rect=table.getBoundingClientRect() + + if(rect && rect.top){ + top=rect.top; + } + } + var maxTableHeight =innerHeight-top; + return maxTableHeight; + }, + calcTableMaxHeight:function(cssSelector) { + var table=cssSelector; + if(typeof cssSelector == 'string'){ + table=document.querySelector(cssSelector); + } + var innerHeight=window.innerHeight + var pageHeight=32 + var top=150; + var bottomHeight=24 + + + if(table!=null){ + var rect=table.getBoundingClientRect() + if(rect && rect.top!=0){ + top=rect.top; + } + } + var maxTableHeight =innerHeight-top-pageHeight-bottomHeight; + return maxTableHeight; + }, } diff --git a/src/components/mdp-ui/mdp-date-range/Index.vue b/src/components/mdp-ui/mdp-date-range/Index.vue index 48b0469..5d0ccab 100644 --- a/src/components/mdp-ui/mdp-date-range/Index.vue +++ b/src/components/mdp-ui/mdp-date-range/Index.vue @@ -1,50 +1,52 @@