From c6f8e27d35cd31bb6393a1e7f747b6b2593dbd7a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 六月 2022 13:56:57 +0800
Subject: [PATCH] 2022-06-08

---
 src/tabviews/custom/components/form/normal-form/index.jsx |   47 +++++------------------------------------------
 1 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 08194e1..7fd5624 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -5,7 +5,6 @@
 import { Spin, notification, Button } from 'antd'
 
 import Api from '@/api'
-import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
 import asyncComponent from '@/utils/asyncComponent'
 import asyncSpinComponent from '@/utils/asyncSpinComponent'
@@ -66,27 +65,12 @@
       }
     }
 
-    let roleId = sessionStorage.getItem('role_id') || ''
-
     config.subcards = config.subcards.map((group, i) => {
       if (i === 0) {
         group.prevButton.enable = 'false'
       }
       if (i + 1 === config.subcards.length) {
         group.nextButton.enable = 'false'
-      }
-
-      group.subButton.uuid = group.uuid
-      group.subButton.$menuId = group.uuid
-      group.subButton.Ot = config.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
-      group.subButton.$forbid = true
-      group.subButton.OpenType = 'formSubmit'
-      group.subButton.execError = 'never'
-
-      group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
-
-      if (group.subButton.syncComponentId === config.uuid) {
-        group.subButton.syncComponentId = ''
       }
 
       if (group.subButton.enable === 'false') {
@@ -96,25 +80,6 @@
       if (group.prevButton.enable === 'false' && group.subButton.enable === 'false' && group.nextButton.enable === 'false') {
         group.$button = 'no-button'
       }
-
-      group.fields = group.fields.map(cell => {
-        // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
-        if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
-          let _option = Utils.getSelectQueryOptions(cell)
-  
-          cell.data_sql = Utils.formatOptions(_option.sql)
-          cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
-          cell.arr_field = _option.field
-        }
-  
-        // 瀛楁鏉冮檺榛戝悕鍗�
-        if (!cell.blacklist || !roleId || cell.blacklist.length === 0) return cell
-        if (cell.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
-          cell.hidden = 'true'
-        }
-  
-        return cell
-      })
 
       return group
     })
@@ -210,16 +175,14 @@
    * @param {*} btn        // 鎵ц鐨勬寜閽�
    */
   refreshByButtonResult = (menuId, position, btn, id) => {
-    const { config, group } = this.state
+    const { config, group, BID } = this.state
 
     if (group.uuid !== menuId) return
 
-    btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
-    if (!btn.syncComponentId || btn.syncComponentId !== config.setting.supModule) {
-      if (config.wrap.datatype !== 'static' && config.setting) {
-        this.loadData()
-      }
+    if (position === 'mainline' && config.setting.supModule && BID) {
+      MKEmitter.emit('reloadData', config.setting.supModule, BID)
+    } else {
+      this.loadData()
     }
 
     if (id) {

--
Gitblit v1.8.0