From cb59703536b8fe29117ea1de415361395f4820e6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 15 八月 2024 12:09:10 +0800
Subject: [PATCH] 2024-08-15
---
src/menu/components/form/simple-form/options.jsx | 1
src/menu/components/timeline/normal-timeline/options.jsx | 1
src/menu/datasource/verifycard/utils.jsx | 4 +-
src/utils/utils-datamanage.js | 12 +++---
src/components/normalform/modalform/index.jsx | 6 +--
src/menu/components/carousel/data-card/options.jsx | 5 +-
src/menu/components/editor/braft-editor/options.jsx | 1
src/menu/components/card/data-card/options.jsx | 9 ++--
src/menu/components/form/step-form/options.jsx | 1
src/menu/debug/index.jsx | 38 +++++++++++++++++--
src/menu/components/card/balcony/options.jsx | 1
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 10 ++--
12 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index 544716e..0ab789f 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -135,10 +135,8 @@
cell.$ctrls = cell.$ctrls || []
cell.$ctrls.push(key)
- if (cell.hidden) return
-
- if (cell.skip && supItem.forbid) { // 涓婄骇琛ㄥ崟绂佺敤鏃讹紝姝よ〃鍗曚笉鍙楁帶鍒�
-
+ if (cell.hidden) {
+
} else if (supItem.hidden) {
cell.hidden = true
} else if (item.notNull) {
diff --git a/src/menu/components/card/balcony/options.jsx b/src/menu/components/card/balcony/options.jsx
index 3361862..519d5b1 100644
--- a/src/menu/components/card/balcony/options.jsx
+++ b/src/menu/components/card/balcony/options.jsx
@@ -170,7 +170,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 1e59f01..ad0ad59 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -161,7 +161,7 @@
{value: 'public', label: '鍏叡鏁版嵁婧�', priKeyType: 'static'},
],
linkFields: ['priKeyType'],
- controlFields: [
+ controlFields: subtype === 'propcard' ? [
{field: 'goback', values: ['dynamic', 'public']},
{field: 'empty', values: ['dynamic', 'public']},
{field: 'jump', values: ['dynamic', 'public']},
@@ -169,7 +169,7 @@
{field: 'supModule', values: ['static']},
{field: 'publicId', values: ['public']},
{field: 'emptyExec', values: ['dynamic', 'public']},
- ],
+ ] : null,
forbid: subtype !== 'propcard'
},
{
@@ -440,9 +440,9 @@
{value: 'normal', label: '姝ｅ父鏄剧ず'},
{value: 'hidden', label: '涓嶅彲瑙�'},
],
- controlFields: [
+ controlFields: subtype === 'propcard' ? [
{field: 'empty', values: ['normal']},
- ],
+ ] : null,
forbid: subtype !== 'propcard'
},
{
@@ -452,7 +452,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
diff --git a/src/menu/components/carousel/data-card/options.jsx b/src/menu/components/carousel/data-card/options.jsx
index f7ba65c..cf5156a 100644
--- a/src/menu/components/carousel/data-card/options.jsx
+++ b/src/menu/components/carousel/data-card/options.jsx
@@ -54,9 +54,9 @@
{value: 'dynamic', label: '鍔ㄦ��'},
{value: 'static', label: '闈欐��'},
],
- controlFields: [
+ controlFields: subtype === 'propcard' ? [
{field: 'empty', values: ['dynamic']},
- ],
+ ] : null,
forbid: subtype !== 'propcard'
},
{
@@ -197,7 +197,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
diff --git a/src/menu/components/editor/braft-editor/options.jsx b/src/menu/components/editor/braft-editor/options.jsx
index 9faed41..d3f260f 100644
--- a/src/menu/components/editor/braft-editor/options.jsx
+++ b/src/menu/components/editor/braft-editor/options.jsx
@@ -125,7 +125,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
diff --git a/src/menu/components/form/simple-form/options.jsx b/src/menu/components/form/simple-form/options.jsx
index a1a4dc4..ab8acc7 100644
--- a/src/menu/components/form/simple-form/options.jsx
+++ b/src/menu/components/form/simple-form/options.jsx
@@ -233,7 +233,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
diff --git a/src/menu/components/form/step-form/options.jsx b/src/menu/components/form/step-form/options.jsx
index aca8cd7..a580960 100644
--- a/src/menu/components/form/step-form/options.jsx
+++ b/src/menu/components/form/step-form/options.jsx
@@ -204,7 +204,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
diff --git a/src/menu/components/timeline/normal-timeline/options.jsx b/src/menu/components/timeline/normal-timeline/options.jsx
index a1ea98b..ae0be4d 100644
--- a/src/menu/components/timeline/normal-timeline/options.jsx
+++ b/src/menu/components/timeline/normal-timeline/options.jsx
@@ -206,7 +206,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index da4c71d..086cff7 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -62,8 +62,8 @@
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey}'`},
{reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@\$|\$@/ig, value: ''},
- {reg: /@select\$|\$select@/ig, value: ''},
- {reg: /@sum\$|\$sum@/ig, value: ''},
+ // {reg: /@select\$|\$select@/ig, value: ''},
+ // {reg: /@sum\$|\$sum@/ig, value: ''},
]
if (window.GLOB.process && type !== 'invoice') {
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 3b440ad..6f89f4b 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -95,6 +95,9 @@
config.interfaces.forEach(m => {
if (m.status !== 'true' || m.setting.interType !== 'system') return false
+ m.setting.laypage = 'false'
+ m.setting.$top = true
+
let sql = this.formatDataSource(m, regs)
this.sqlList.push({label: m.setting.name, children: [{label: '鏁版嵁婧�', sql: sql}]})
@@ -309,6 +312,11 @@
}
if (item.setting && item.setting.interType === 'system') {
+ if (item.format === 'object') {
+ item.setting.laypage = 'false'
+ item.setting.$top = true
+ }
+
let sql = this.formatDataSource(item, regs, _mainSearch)
children.push({label: '鏁版嵁婧�', sql: sql})
@@ -656,8 +664,24 @@
let BID = Utils.getuuid()
let verify = btn.verify || {}
let _actionType = null
- let setting = component.setting
+ let setting = component.setting || {}
let columns = component.columns || []
+
+ if (verify.invalid === 'true') {
+ if (component.wrap && (component.wrap.datatype === 'static' || component.wrap.datatype === 'public')) {
+ verify.invalid = 'false'
+ } else if (setting.maxScript && setting.maxScript >= 300) {
+ verify.invalid = 'false'
+ } else if (!setting.dataresource) {
+ verify.invalid = 'false'
+ } else if (btn.intertype !== 'system' && btn.procMode !== 'system') {
+ verify.invalid = 'false'
+ } else if (btn.sqlType === 'insert') {
+ verify.invalid = 'false'
+ } else if (btn.Ot === 'notRequired') {
+ verify.invalid = 'false'
+ }
+ }
if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
_actionType = btn.sqlType
@@ -820,7 +844,7 @@
})
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (btn.Ot !== 'notRequired' && columns && columns.length > 0) {
+ if (btn.Ot !== 'notRequired' && columns.length > 0) {
const setField = (col) => {
if (!col.field) return
let _key = col.field.toLowerCase()
@@ -955,7 +979,7 @@
}
// 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- if (btn.sqlType !== 'insert' && btn.Ot !== 'notRequired' && verify.invalid === 'true' && setting.dataresource) {
+ if (verify.invalid === 'true') {
let datasource = setting.dataresource
let customScript = setting.customScript || ''
let orderBy = setting.order
@@ -2055,7 +2079,7 @@
formatDataSource = (item, regs, mainSearch = []) => {
if (!item.setting || item.setting.interType !== 'system') return false
-
+
let searches = item.search || []
if (item.setting.useMSearch === 'true' && mainSearch.length > 0) {
searches = [...searches, ...mainSearch]
@@ -2120,6 +2144,12 @@
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
} else if (item.setting.laypage === 'true' && item.setting.order) {
_dataresource = `/*system_query*/select top 10 ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${item.setting.order}) as rows from ${_dataresource} ${_search}) tmptable where rows > 0 order by tmptable.rows `
+ } else if (item.setting.$top) {
+ if (item.setting.order) {
+ _dataresource = `/*system_query*/select top 1 ${arr_field} from ${_dataresource} ${_search} order by ${item.setting.order} `
+ } else {
+ _dataresource = `/*system_query*/select top 1 ${arr_field} from ${_dataresource} ${_search} `
+ }
} else if (item.setting.order) {
_dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${item.setting.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
} else {
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 846ae2f..04e64a4 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -38,13 +38,13 @@
_customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'1949-10-01 15:00:00'`)
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
- _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
- _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
+ // _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
+ // _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
// _dataresource = _dataresource.replace(/@sum\$|\$sum@/ig, '')
- _customScript = _customScript.replace(/@sum\$|\$sum@/ig, '')
+ // _customScript = _customScript.replace(/@sum\$|\$sum@/ig, '')
- _dataresource = _dataresource.replace(/\$sum@/ig, '/*$sum@')
- _dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
+ // _dataresource = _dataresource.replace(/\$sum@/ig, '/*$sum@')
+ // _dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 26f08c9..232cb36 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -142,9 +142,9 @@
{ reg: /@orderBy@/ig, value: orderBy },
{ reg: /@pageSize@/ig, value: setting.laypage ? pageSize : '9999' },
{ reg: /@pageIndex@/ig, value: pageIndex},
- { reg: /@select\$|\$select@/ig, value: ''},
- { reg: /\$sum@/ig, value: '/*'},
- { reg: /@sum\$/ig, value: '*/'},
+ // { reg: /@select\$|\$select@/ig, value: ''},
+ // { reg: /\$sum@/ig, value: '/*'},
+ // { reg: /@sum\$/ig, value: '*/'},
{ reg: /@ID@/ig, value: `'${id || ''}'`},
{ reg: /@BID@/ig, value: `'${BID || ''}'`},
{ reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
@@ -375,9 +375,9 @@
{ reg: /@orderBy@/ig, value: orderBy },
{ reg: /@pageSize@/ig, value: 999999 },
{ reg: /@pageIndex@/ig, value: 1},
- { reg: /\$select@/ig, value: '/*'},
- { reg: /@select\$/ig, value: '*/'},
- { reg: /@sum\$|\$sum@/ig, value: ''},
+ // { reg: /\$select@/ig, value: '/*'},
+ // { reg: /@select\$/ig, value: '*/'},
+ // { reg: /@sum\$|\$sum@/ig, value: ''},
{ reg: /@ID@/ig, value: `''`},
{ reg: /@BID@/ig, value: `'${BID || ''}'`},
{ reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
--
Gitblit v1.8.0