From d3e3e32f62955e7ac7983bde70924daaacab5dc1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 九月 2020 13:33:37 +0800
Subject: [PATCH] 2020-09-08
---
src/templates/comtableconfig/index.jsx | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 94192c4..2793a2e 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -175,6 +175,14 @@
}
})
}
+
+ // // 鍏煎鎺ュ彛绫诲瀷
+ // _config.action = _config.action.map(item => {
+ // if (item.intertype === 'inner' && !item.innerFunc) {
+ // item.intertype = 'system'
+ // }
+ // return item
+ // })
}
let _oriActions = []
@@ -371,7 +379,7 @@
type: 'view',
subtype: 'view',
uuid: menu.MenuID,
- intertype: _config.setting.interType || 'inner',
+ intertype: _config.setting.interType || 'system',
interface: _config.setting.interface || '',
tableName: _config.setting.tableName || '',
innerFunc: _config.setting.innerFunc || '',
@@ -381,7 +389,7 @@
_config.action.forEach(item => {
let tablename = item.OpenType === 'excelIn' ? (item.sheet || '') : (item.sql || '')
- if (item.OpenType === 'excelOut' && item.intertype === 'inner' && !item.innerFunc) {
+ if (item.OpenType === 'excelOut' && item.intertype === 'system') {
tablename = _config.setting.tableName || ''
}
@@ -1157,7 +1165,7 @@
})
- if (config.setting.interType === 'inner' && !config.setting.innerFunc && config.setting.default !== 'false' && !config.setting.dataresource) {
+ if (((config.setting.interType === 'inner' && !config.setting.innerFunc) || config.setting.interType === 'system') && config.setting.default !== 'false' && !config.setting.dataresource) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
} else if (!config.setting.primaryKey) {
return '鑿滃崟灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒'
--
Gitblit v1.8.0