From 42fae277ae5ebe794fc070bf38482a919eb661fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十一月 2020 14:36:02 +0800
Subject: [PATCH] 2020-11-25

---
 src/templates/zshare/formconfig.jsx |   69 +++++++++++++++++++++++++++++-----
 1 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 46ceaa8..a5d10b9 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -284,10 +284,20 @@
 /**
  * @description 鑾峰彇鎼滅储鏉′欢琛ㄥ崟閰嶇疆淇℃伅
  * @param {object} card           // 鎼滅储鏉′欢瀵硅薄
- * @param {Array}  roleList       // 瑙掕壊鍒楄〃
  * @param {Array}  linkableFields // 鍙叧鑱斿瓧娈�
  */
-export function getSearchForm (card, roleList, linkableFields) {
+export function getSearchForm (card, linkableFields) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+
   return [
     {
       type: 'text',
@@ -602,10 +612,10 @@
  * @param {*} card           缂栬緫鎸夐挳
  * @param {*} functip        鐢熸垚瀛樺偍杩囩▼鎻愮ず
  * @param {*} config         椤甸潰閰嶇疆
- * @param {*} permFuncField  瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
+ * @param {*} usefulFields   瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
  * @param {*} type           鎸夐挳绫诲瀷锛岀敤浜庡尯鍒嗗彲閫夌殑鎵撳紑鏂瑰紡
  */
-export function getActionForm (card, functip, config, permFuncField, type, menulist = [], printTemps = []) {
+export function getActionForm (card, functip, config, usefulFields, type, menulist = [], printTemps = []) {
   let opentypes = [
     {
       value: 'pop',
@@ -753,7 +763,7 @@
       label: Formdict['header.form.innerFunc'],
       initVal: card.innerFunc || '',
       tooltip: functip,
-      fields: permFuncField,
+      fields: usefulFields,
       tooltipClass: 'middle',
       required: card.intertype === 'inner',
       readonly: false
@@ -1055,10 +1065,20 @@
 /**
  * @description 鑾峰彇鏄剧ず鍒楄〃鍗曢厤缃俊鎭�
  * @param {object} card       // 鎼滅储鏉′欢瀵硅薄
- * @param {Array}  roleList   // 瑙掕壊鍒楄〃-榛戝悕鍗�
  * @param {Array}  menulist   // 鑿滃崟鍒楄〃-鐢ㄤ簬瀛楁閫忚
  */
-export function getColumnForm (card, roleList = [], menulist = []) {
+export function getColumnForm (card, menulist = []) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+
   return [
     {
       type: 'text',
@@ -1341,12 +1361,22 @@
 /**
  * @description 鑾峰彇鍥捐〃瑙嗗浘澶栭儴閰嶇疆琛ㄥ崟
  * @param {object} card         // 鎼滅储鏉′欢瀵硅薄
- * @param {Array}  roleList     // 瑙掕壊鍒楄〃-榛戝悕鍗�
  * @param {Array}  columns      // 鏄剧ず鍒�
  * @param {Array}  actions      // 鎸夐挳缁別xcel
  * @param {Array}  extraActions // 甯歌鎸夐挳
  */
-export function getChartViewForm (card, roleList = [], _columns, actions, extraActions) {
+export function getChartViewForm (card, _columns, actions, extraActions) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+
   let _charts = [{
     value: 'line',
     text: '鎶樼嚎鍥�'
@@ -1787,9 +1817,26 @@
  * @param {*} linkableFields  // 鍙叧鑱旇〃鍗�
  * @param {*} linksupFields   // 涓婄骇琛ㄥ崟
  * @param {*} subtable        // 鏄惁涓哄瓙琛ㄨ〃鍗�
- * @param {*} roleList        // 瑙掕壊鍒楄〃-榛戝悕鍗�
  */
-export function getModalForm (card, inputfields, linkableFields, linksupFields, subtable = false, roleList = []) {
+export function getModalForm (card, inputfields, linkableFields, linksupFields, subtable = false) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+      roleList = roleList.map(role => {
+        return {
+          uuid: role.uuid,
+          field: role.value,
+          label: role.text
+        }
+      })
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+  
   let _openType = []
   let _fieldlength = 50
 

--
Gitblit v1.8.0