From f31d6505363fa191fb715976826369484c26cf16 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期二, 03 十二月 2024 12:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
index d964c82..19fd485 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
@@ -211,7 +211,7 @@
isShow: {
handler(newval) {
if (newval && this.$el.clientHeight > 50) {
- this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
+ this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - (this.$children[0].$children[2].$el.clientHeight || 57) - 5;
}
if(newval){
this.handleRefresh();
@@ -270,6 +270,7 @@
const queryFields = !validatenull(this.currentDefineVO.queryColumns) ? this.currentDefineVO.queryColumns.map(item => item.field) : [];
return this.currentDefineVO.cols[0].map(item => {
const search = queryFields.includes(item.field); // 鍒ゆ柇 field 鏄惁鍦� queryColumns 閲�
+ item.type = this.columnType[item.fieldType] || item.fieldType;
if (this.currentDefineVO.btmType == 'fileobject' && item.field == 'name') {
//鏄枃浠�
item.formatter = function (d) {
@@ -280,31 +281,50 @@
if (typeof formatter == "string" && formatter != '') {
formatter = eval("(" + formatter + ")");
}
- item.type = this.columnType[item.fieldType] || item.fieldType;
+ if (['date', 'datetime', 'time'].includes(item.type)) {
+ item.valueFormat = item.dateFormate;
+ item.format = item.dateFormate;
+ }
return {
...item,
prop: item.field,
label: item.title,
search: search,
- formatter: formatter
+ formatter: formatter,
+ overHidden: true
};
});
},
sourceDataMap: function () {
const sourceDataMap = {};
if (Object.keys(this.sourceData).length>0) {
- if(this.sourceData.oid ) {
- if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
- this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ if(this.sourceData.part && Object.keys(this.sourceData.part).length>0){
+ //璇存槑婧愭暟鎹槸鏍戣妭鐐�
+ if(this.sourceData.part.oid ) {
+ if (this.sourceData.part.oid.indexOf('@vcitreesep@') > -1) {
+ this.sourceData.part.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ }
+ sourceDataMap.sourceBtmName = this.sourceBtmType;
+ sourceDataMap.sourceOid = this.sourceData.part.oid;
}
- sourceDataMap.sourceBtmName = this.sourceBtmType;;
- sourceDataMap.sourceOid = this.sourceData.oid;
+ }else {
+ if(this.sourceData.oid ) {
+ if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
+ this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ }
+ sourceDataMap.sourceBtmName = this.sourceBtmType;
+ sourceDataMap.sourceOid = this.sourceData.oid;
+ }
}
+
for (let i in this.sourceData) {
const item = this.sourceData[i]
- if (item && item.constructor === Object) continue;
if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ if (item && item.constructor === Object) {
+ sourceDataMap['sourceData["' + i + '"]'] = JSON.stringify(item)
+ }else {
+ sourceDataMap['sourceData["' + i + '"]'] = item
+ }
}
}
--
Gitblit v1.9.3