From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/table/normal-table/columns/index.jsx | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index e6af839..f30dc30 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -47,11 +47,6 @@
cols: [column]
}
- let srcid = localStorage.getItem(window.GLOB.sysSign + 'srcId')
- if (srcid) {
- val.$srcId = srcid
- }
-
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
document.body.appendChild(oInput)
oInput.select()
@@ -381,7 +376,7 @@
if (!cell.eleType) {
if (cell.copyType === 'action') {
cell.eleType = 'button'
- cell.width = cell.width || 12
+ cell.width = cell.width || cell.width === 0 ? cell.width : 12
} else {
cell.eleType = 'text'
}
@@ -518,11 +513,6 @@
cols: columns.filter(col => !col.origin)
}
- let srcid = localStorage.getItem(window.GLOB.sysSign + 'srcId')
- if (srcid) {
- val.$srcId = srcid
- }
-
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
document.body.appendChild(oInput)
oInput.select()
@@ -579,7 +569,7 @@
fields.forEach(item => {
if (keys.includes(item.field)) return
- let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'true', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
+ let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'false', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
if (/Nvarchar|date/ig.test(item.datatype)) {
cell.type = 'text'
--
Gitblit v1.8.0