From 4eae7af1ce6cd0ea8ac6485e26528625e83c3c70 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十月 2021 15:18:57 +0800
Subject: [PATCH] 2021-10-12

---
 src/menu/popview/index.jsx |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/menu/popview/index.jsx b/src/menu/popview/index.jsx
index a85ea98..9f1a385 100644
--- a/src/menu/popview/index.jsx
+++ b/src/menu/popview/index.jsx
@@ -178,6 +178,11 @@
       MenuID: MenuId
     }
 
+    if (sessionStorage.getItem('appType') === 'pc') {
+      param.TypeCharOne = sessionStorage.getItem('kei_no')
+      param.Typename = 'pc'
+    }
+
     Api.getSystemConfig(param).then(result => {
       if (result.status) {
         let config = null
@@ -379,11 +384,18 @@
         LText: []
       }
 
-      btnParam.LText = this.getMenuMessage()
-      btnParam.LText = btnParam.LText.join(' union all ')
-      btnParam.LText = Utils.formatOptions(btnParam.LText)
-      btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-      btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+      if (sessionStorage.getItem('appType') === 'pc') {
+        param.TypeCharOne = sessionStorage.getItem('kei_no')
+        param.Typename = 'pc'
+
+        btnParam.LText = ''
+      } else {
+        btnParam.LText = this.getMenuMessage()
+        btnParam.LText = btnParam.LText.join(' union all ')
+        btnParam.LText = Utils.formatOptions(btnParam.LText)
+        btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+        btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+      }
 
       new Promise(resolve => {
         if (delButtons.length === 0) {
@@ -496,6 +508,8 @@
           error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
         } else if (item.setting.interType && !item.setting.primaryKey) {
           error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+        } else if (!item.setting.supModule) {
+          error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
         }
       }
       if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {

--
Gitblit v1.8.0