From 94d8dcae695daabeb3f9d298ace370a2e8127f6a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 十月 2024 11:42:23 +0800
Subject: [PATCH] 2024-10-22
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 6 +++---
src/api/index.js | 11 ++++++++---
src/menu/components/share/actioncomponent/formconfig.jsx | 24 ------------------------
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 +---
4 files changed, 12 insertions(+), 33 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/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({
--
Gitblit v1.8.0