From 2798c78869b1042a78bf7d99c1164c822990c236 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 21:42:00 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 4 ++++
src/menu/components/table/base-table/columns/index.jsx | 2 ++
src/menu/components/form/formaction/actionform/index.jsx | 3 +++
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 ++--
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index b8967c0..b21638c 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -377,6 +377,9 @@
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ if (values.outerBlacklist) {
+ values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
+ }
resolve(values)
} else {
reject(err)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 45a8b3a..70f1b79 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1065,6 +1065,10 @@
})
}
}
+
+ if (values.outerBlacklist) {
+ values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
+ }
if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
let list = null
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index 69aacdc..5b6a30a 100644
--- a/src/menu/components/table/base-table/columns/index.jsx
+++ b/src/menu/components/table/base-table/columns/index.jsx
@@ -324,6 +324,8 @@
col.subcols = []
} else if (col.type === 'index') {
col.label = '搴忓彿'
+ } else if (col.type === 'number') {
+ col.Width = 80
}
let hIndex = +hoverIndex
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 48ae9df..1d010b2 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1494,14 +1494,14 @@
if (typeof(val) === 'string') {
val = val.replace(/'/ig, '"')
}
- keys.push(key)
+ keys.push('[' + key + ']')
vals.push(`'${val}'`)
}
})
lines.push({
table: tb,
- insert: `Insert into ${pre}${tb} (${keys.join(',')},mk_level,mk_id,mk_bid)`,
+ insert: `Insert into ${pre}${tb} (${keys.join(',')},[mk_level],[mk_id],[mk_bid])`,
select: `Select ${vals.join(',')},'${level}','${id}','${bid}'`
})
--
Gitblit v1.8.0