From 36bbb746731b65d401cbe49853227e316d5e8c32 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 十一月 2024 16:46:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 cc24f79..243aa33 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
@@ -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,13 +281,17 @@
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
};
});
},
--
Gitblit v1.9.3