From f2acacad2b7ff966165a05df708f844f0a96be66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 十月 2024 17:03:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/tab-form/index.jsx | 2
src/tabviews/custom/components/card/prop-card/index.jsx | 2
src/tabviews/custom/components/code/sand-box/index.jsx | 2
src/tabviews/custom/components/editor/braft-editor/index.jsx | 2
src/views/pcdesign/index.jsx | 22 +++---
src/menu/components/share/actioncomponent/formconfig.jsx | 24 --------
src/views/tabledesign/index.jsx | 22 +++---
src/menu/components/share/actioncomponent/actionform/index.jsx | 6 +-
src/tabviews/custom/components/carousel/prop-card/index.jsx | 2
src/api/index.js | 11 ++-
src/tabviews/custom/components/form/step-form/index.jsx | 2
src/tabviews/custom/components/form/simple-form/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 -
src/tabviews/custom/components/iframe/index.jsx | 2
src/views/mobdesign/index.jsx | 22 +++---
src/views/menudesign/index.jsx | 30 +++++-----
16 files changed, 68 insertions(+), 89 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index a4a7bf6..1633765 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1036,9 +1036,14 @@
window.mkInfo(n)
})
}
- if (res.ErrCode === 'version_error') {
- res.ErrCode = '-2'
- MKEmitter.emit('reloadTabs')
+ if (!res.status) {
+ if (res.ErrCode === 'version_error') {
+ res.ErrCode = '-2'
+ MKEmitter.emit('reloadTabs')
+ } else if (res.message === 'permission deny') {
+ res.message = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+ res.ErrMesg = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+ }
}
resolve(res)
})
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 2bd768f..dcf94bf 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -15,9 +15,9 @@
const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'hoverTitle', 'hidden', 'preButton', 'excache'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'excache'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton', 'excache'],
+ pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'hoverTitle', 'hidden', 'preButton'],
+ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton'],
+ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton'],
excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden', 'refreshTab'],
excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden', 'refreshTab'],
popview: ['label', 'Ot', 'OpenType', 'show', 'hover', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'],
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 723c5c4..e1544de 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1465,18 +1465,6 @@
forbid: viewType === 'popview'
},
{
- type: 'radio',
- key: 'excache',
- label: '娓呴櫎缂撳瓨',
- initVal: card.excache || 'false',
- tooltip: '鍦ㄤ娇鐢ㄥ悗绔剼鏈椂锛屾槸鍚︽竻闄ゅ悗绔紦瀛橈紝娉細闇�鍦ㄦ搷浣滅敤鎴锋垨鏉冮檺鏃跺紑鍚��',
- required: false,
- options: [
- {value: 'true', text: '寮�鍚�'},
- {value: 'false', text: '鍏抽棴'},
- ]
- },
- {
type: 'splitLine',
key: 'title',
label: '琛ㄥ崟',
@@ -2735,18 +2723,6 @@
{value: 'false', text: '绂佺敤'},
],
forbid: viewType === 'popview'
- },
- {
- type: 'radio',
- key: 'excache',
- label: '娓呴櫎缂撳瓨',
- initVal: card.excache || 'false',
- tooltip: '鍦ㄤ娇鐢ㄥ悗绔剼鏈椂锛屾槸鍚︽竻闄ゅ悗绔紦瀛橈紝娉細闇�鍦ㄦ搷浣滅敤鎴锋垨鏉冮檺鏃跺紑鍚��',
- required: false,
- options: [
- {value: 'true', text: '寮�鍚�'},
- {value: 'false', text: '鍏抽棴'},
- ]
},
{
type: 'radio',
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 31e944d..88bcf0e 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -49,7 +49,7 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index 67804bc..1371a71 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -49,7 +49,7 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 7ef92b2..0116fe3 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -42,7 +42,7 @@
}
if (_config.wrap.datatype !== 'static') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/custom/components/editor/braft-editor/index.jsx b/src/tabviews/custom/components/editor/braft-editor/index.jsx
index 10d7605..24d3909 100644
--- a/src/tabviews/custom/components/editor/braft-editor/index.jsx
+++ b/src/tabviews/custom/components/editor/braft-editor/index.jsx
@@ -43,7 +43,7 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 9a5e5fc..b62d1ab 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -46,7 +46,7 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index a1f7972..e313c20 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -46,7 +46,7 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index bce6e0b..9ee3802 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -45,7 +45,7 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/custom/components/iframe/index.jsx b/src/tabviews/custom/components/iframe/index.jsx
index 50352bb..1178319 100644
--- a/src/tabviews/custom/components/iframe/index.jsx
+++ b/src/tabviews/custom/components/iframe/index.jsx
@@ -43,7 +43,7 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
if (_config.setting.supModule && !BID) {
_config.setting.onload = 'false'
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index b816257..aba982e 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2938,7 +2938,7 @@
tabId = btn.refreshTab[btn.refreshTab.length - 1]
}
- if (btn.excache === 'true') {
+ if (window.backend && btn.outerFunc && ['bd_workers_create_user_sso', 's_susers_del', 's_susers_add', 's_susers_update', 's_susers_start', 's_susers_admin'].includes(btn.outerFunc)) {
this.clearBackSqlCache()
}
@@ -3053,8 +3053,6 @@
}
clearBackSqlCache = () => {
- if (!window.backend) return
-
Api.cacheInterface({}).then(res => {
if (!res.status) {
notification.warning({
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 08d59ff..ae6e8cd 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -808,6 +808,10 @@
delete config.force
}
+ if (config.MenuID === 'home_page_id' || MenuType === 'billPrint') {
+ config.permission = 'false'
+ }
+
let long_data = ''
if (config.enabled) {
let sqls = getAllSqls(config)
@@ -822,20 +826,20 @@
}
long_data = []
- let oriIds = {}
- if (config.allSqls) {
- config.allSqls.forEach(item => {
- if (!item.md5) return
- oriIds[item.uuid + item.md5] = item.v_id
- })
- }
+ // let oriIds = {}
+ // if (config.allSqls) {
+ // config.allSqls.forEach(item => {
+ // if (!item.md5) return
+ // oriIds[item.uuid + item.md5] = item.v_id
+ // })
+ // }
config.allSqls = sqls.map(item => {
let v_id = _t + getguid()
- if (oriIds[item.uuid + item.md5]) {
- v_id = oriIds[item.uuid + item.md5]
- }
+ // if (oriIds[item.uuid + item.md5]) {
+ // v_id = oriIds[item.uuid + item.md5]
+ // }
long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${config.permission === 'false' ? '' : item.roleId || ''}`)
@@ -844,7 +848,7 @@
v_id: v_id,
type: item.type,
reps: item.reps,
- md5: item.md5 || '',
+ // md5: item.md5 || '',
luser: item.luser === true
}
})
@@ -856,10 +860,6 @@
if (config.cacheUseful !== 'true') {
config.components = this.resetSyncQuery(config.components)
- }
-
- if (config.MenuID === 'home_page_id') {
- config.permission = 'false'
}
let tbs = []
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 24a0172..b0abea2 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1497,20 +1497,20 @@
}
long_data = []
- let oriIds = {}
- if (config.allSqls) {
- config.allSqls.forEach(item => {
- if (!item.md5) return
- oriIds[item.uuid + item.md5] = item.v_id
- })
- }
+ // let oriIds = {}
+ // if (config.allSqls) {
+ // config.allSqls.forEach(item => {
+ // if (!item.md5) return
+ // oriIds[item.uuid + item.md5] = item.v_id
+ // })
+ // }
config.allSqls = sqls.map(item => {
let v_id = _t + getguid()
- if (oriIds[item.uuid + item.md5]) {
- v_id = oriIds[item.uuid + item.md5]
- }
+ // if (oriIds[item.uuid + item.md5]) {
+ // v_id = oriIds[item.uuid + item.md5]
+ // }
long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${item.roleId || ''}`)
@@ -1519,7 +1519,7 @@
v_id: v_id,
type: item.type,
reps: item.reps,
- md5: item.md5 || '',
+ // md5: item.md5 || '',
luser: item.luser === true
}
})
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 62c5c68..bcfb33b 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1223,20 +1223,20 @@
}
long_data = []
- let oriIds = {}
- if (config.allSqls) {
- config.allSqls.forEach(item => {
- if (!item.md5) return
- oriIds[item.uuid + item.md5] = item.v_id
- })
- }
+ // let oriIds = {}
+ // if (config.allSqls) {
+ // config.allSqls.forEach(item => {
+ // if (!item.md5) return
+ // oriIds[item.uuid + item.md5] = item.v_id
+ // })
+ // }
config.allSqls = sqls.map(item => {
let v_id = _t + getguid()
- if (oriIds[item.uuid + item.md5]) {
- v_id = oriIds[item.uuid + item.md5]
- }
+ // if (oriIds[item.uuid + item.md5]) {
+ // v_id = oriIds[item.uuid + item.md5]
+ // }
long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${item.roleId || ''}`)
@@ -1245,7 +1245,7 @@
v_id: v_id,
type: item.type,
reps: item.reps,
- md5: item.md5 || '',
+ // md5: item.md5 || '',
luser: item.luser === true
}
})
diff --git a/src/views/tabledesign/index.jsx b/src/views/tabledesign/index.jsx
index 547c843..5a1ca72 100644
--- a/src/views/tabledesign/index.jsx
+++ b/src/views/tabledesign/index.jsx
@@ -582,20 +582,20 @@
}
long_data = []
- let oriIds = {}
- if (config.allSqls) {
- config.allSqls.forEach(item => {
- if (!item.md5) return
- oriIds[item.uuid + item.md5] = item.v_id
- })
- }
+ // let oriIds = {}
+ // if (config.allSqls) {
+ // config.allSqls.forEach(item => {
+ // if (!item.md5) return
+ // oriIds[item.uuid + item.md5] = item.v_id
+ // })
+ // }
config.allSqls = sqls.map(item => {
let v_id = _t + getguid()
- if (oriIds[item.uuid + item.md5]) {
- v_id = oriIds[item.uuid + item.md5]
- }
+ // if (oriIds[item.uuid + item.md5]) {
+ // v_id = oriIds[item.uuid + item.md5]
+ // }
long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${item.roleId || ''}`)
@@ -604,7 +604,7 @@
v_id: v_id,
type: item.type,
reps: item.reps,
- md5: item.md5 || '',
+ // md5: item.md5 || '',
luser: item.luser === true
}
})
--
Gitblit v1.8.0