From a123ffc7359edf09c9fc2ba157e2e5762cf63cee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 17 九月 2023 12:44:02 +0800
Subject: [PATCH] 2023-09-17
---
src/templates/zshare/modalform/index.jsx | 2 +-
src/api/index.js | 4 ++--
src/components/header/index.jsx | 2 +-
src/tabviews/custom/components/card/cardItem/index.jsx | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index d1ebab7..0b6080c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1032,9 +1032,9 @@
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- sql = sql.replace(/\n\s{6,20}/ig, ' ')
+ console.info(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
- console.info(`/* sql 楠岃瘉 */\n${sql}`)
+ sql = sql.replace(/\n/ig, ' ')
param.LText = Utils.formatOptions(sql)
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 863d21b..9269928 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -214,7 +214,7 @@
_permAction[menu.MenuID] = true
})
}
- } else {
+ } else if (!/PRIMARY KEY/ig.test(result.message)) {
notification.error({
top: 92,
message: result.message,
diff --git a/src/tabviews/custom/components/card/cardItem/index.jsx b/src/tabviews/custom/components/card/cardItem/index.jsx
index b601bc9..aa25ec8 100644
--- a/src/tabviews/custom/components/card/cardItem/index.jsx
+++ b/src/tabviews/custom/components/card/cardItem/index.jsx
@@ -16,7 +16,7 @@
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.props.data), fromJS(nextProps.data))
+ return !is(fromJS(this.props), fromJS(nextProps))
}
/**
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 3aaa932..42a2cb0 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -27,7 +27,7 @@
checkcard: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'span', 'labelwidth', 'display', 'tooltip', 'extra', 'place', 'width', 'multiple', 'splitline', 'marginTop', 'marginBottom'],
multiselect: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'marginTop', 'marginBottom', 'dropdown'],
link: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'setAll', 'linkField', 'linkSubField', 'span', 'place', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline', 'dropdown', 'marginTop', 'marginBottom', 'pickerMode'],
- fileupload: ['readonly', 'required', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'compress', 'miniSet', 'splitline', 'marginTop', 'marginBottom', 'maxSize'],
+ fileupload: ['readonly', 'required', 'hidden', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'compress', 'miniSet', 'splitline', 'marginTop', 'marginBottom', 'maxSize'],
switch: ['initval', 'openVal', 'closeVal', 'openText', 'closeText', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'linkSubField', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom'],
check: ['initval', 'openVal', 'closeVal', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom', 'checkTip'],
date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'place', 'marginTop', 'marginBottom', 'minDate', 'maxDate', 'precision'],
--
Gitblit v1.8.0