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/calendarconfig/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/templates/calendarconfig/index.jsx b/src/templates/calendarconfig/index.jsx
index 436af72..6a0b83f 100644
--- a/src/templates/calendarconfig/index.jsx
+++ b/src/templates/calendarconfig/index.jsx
@@ -24,7 +24,7 @@
const { Panel } = Collapse
const { confirm } = Modal
-const SettingComponent = asyncComponent(() => import('@/templates/sharecomponent/datasourcecomponent'))
+const SettingComponent = asyncComponent(() => import('@/templates/sharecomponent/settingcalcomponent'))
const TabComponent = asyncComponent(() => import('./tabcomponent'))
const CalComponent = asyncComponent(() => import('./calcomponent'))
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
@@ -309,7 +309,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 || '',
@@ -682,7 +682,7 @@
calvaild = false
}
- 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.columns.length === 0) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁瀛楁锛屼笉鍙惎鐢紒'
--
Gitblit v1.8.0