From 3ca91a731665962918a026f521c556f4745ebf35 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 16 十一月 2020 19:20:19 +0800
Subject: [PATCH] 2020-11-16

---
 src/templates/sharecomponent/settingcomponent/settingform/utils.jsx |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index c5bb301..b5c6d98 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -12,11 +12,9 @@
     let _dataresource = setting.dataresource
     let _customScript = ''
     scripts && scripts.forEach(script => {
-      if (script.status !== 'false') {
-        _customScript += `
-        ${script.sql}
-        `
-      }
+      _customScript += `
+      ${script.sql}
+      `
     })
 
     if (_customScript) {
@@ -25,7 +23,7 @@
       `
     }
 
-    if (setting.interType === 'system' && setting.default === 'false') {
+    if (setting.default === 'false') {
       _dataresource = ''
     }
     
@@ -89,7 +87,7 @@
     } else {
       sql = _dataresource
     }
-    
+
     return sql
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0