From 4141e18a9aee7c2a3887ff99bf0b1343d5771b79 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 十一月 2023 15:25:57 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/form/simple-form/index.jsx |   69 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index bd481d5..3a87da3 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -25,8 +25,7 @@
     loading: false,
     data: null,
     group: null,
-    BData: '',
-    step: 0
+    BData: ''
   }
 
   UNSAFE_componentWillMount () {
@@ -58,13 +57,20 @@
   
         window.GLOB.SyncData.delete(_config.dataName)
       }
+    } else if (_config.wrap.datatype === 'public') {
+      if (window.GLOB.CacheData.has(_config.wrap.publicId)) {
+        _data = window.GLOB.CacheData.get(_config.wrap.publicId)
+        _data = fromJS(_data).toJS()
+        _data.$$BID = BID || ''
+        _data.$$BData = BData || ''
+      }
     } else {
       _data = {$$empty: true}
     }
 
     let _group = _config.subcards[0]
 
-    if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true')) {
+    if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true') && (!_group.resetButton || _group.resetButton.enable !== 'true')) {
       _group.subButton.style.display = 'none'
       _group.$button = 'no-button'
     }
@@ -74,8 +80,7 @@
       group: _group,
       BID: BID || '',
       BData: BData || '',
-      config: _config,
-      arr_field: _config.columns.map(col => col.field).join(',')
+      config: _config
     })
   }
 
@@ -95,6 +100,10 @@
       MKEmitter.addListener('transferSyncData', this.transferSyncData)
     }
 
+    if (config.wrap.datatype === 'public') {
+      MKEmitter.addListener('mkPublicData', this.mkPublicData)
+    }
+
     this.initExec()
   }
 
@@ -107,6 +116,7 @@
       return
     }
     MKEmitter.removeListener('reloadData', this.reloadData)
+    MKEmitter.removeListener('mkPublicData', this.mkPublicData)
     MKEmitter.removeListener('mkFormSubmit', this.mkFormSubmit)
     MKEmitter.removeListener('searchRefresh', this.searchRefresh)
     MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
@@ -140,6 +150,23 @@
     MKEmitter.removeListener('transferSyncData', this.transferSyncData)
   }
 
+  mkPublicData = (publicId, data) => {
+    const { config, BID, BData } = this.state
+
+    if (config.wrap.datatype === 'public' && config.wrap.publicId === publicId) {
+      let _data = fromJS(data).toJS()
+
+      _data.$$BID = BID || ''
+      _data.$$BData = BData || ''
+
+      this.setState({
+        data: null
+      }, () => {
+        this.setState({data: _data})
+      })
+    }
+  }
+
   searchRefresh = (searchId) => {
     const { config } = this.state
 
@@ -171,6 +198,12 @@
 
     if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
       MKEmitter.emit('reloadData', config.setting.supModule, BID)
+    } else if (position === 'grid' && config.wrap.datatype === 'static') {
+      this.setState({
+        data: null
+      }, () => {
+        this.setState({data: {$$empty: true}})
+      })
     } else {
       this.loadData()
     }
@@ -209,7 +242,7 @@
   execSuccess = (btn, id) => {
     if (btn.linkmenu && btn.linkmenu.length > 0) {
       let menu_id = btn.linkmenu[btn.linkmenu.length - 1]
-      let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+      let menu = window.GLOB.mkThdMenus.get(menu_id) || ''
 
       if (!menu) return
 
@@ -223,9 +256,12 @@
   }
 
   async loadData () {
-    const { config, arr_field, BID } = this.state
+    const { config, BID } = this.state
 
-    if (config.wrap.datatype === 'static') {
+    if (config.wrap.datatype === 'public') {
+      MKEmitter.emit('reloadData', config.wrap.publicId)
+      return
+    } else if (config.wrap.datatype === 'static') {
       this.setState({
         data: {$$empty: true}
       })
@@ -254,7 +290,7 @@
     })
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
+    let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
@@ -304,13 +340,15 @@
     }
   }
 
-  mkFormSubmit = (btnId) => {
+  mkFormSubmit = (btnId, callback) => {
     const { group } = this.state
 
     if (group.uuid !== btnId) return
 
     this.formRef.handleConfirm().then(res => {
       MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res})
+    }, () => {
+      callback && callback()
     })
   }
 
@@ -318,6 +356,16 @@
     const { group } = this.state
 
     MKEmitter.emit('closeTabView', group.subButton.$MenuID)
+  }
+
+  resetTab = () => {
+    const { data } = this.state
+
+    this.setState({
+      data: null
+    }, () => {
+      this.setState({data: data})
+    })
   }
 
   render() {
@@ -352,6 +400,7 @@
             columns={config.columns}
             selectedData={data.$$empty ? [] : [data]}
           />
+          {group.resetButton && group.resetButton.enable === 'true' ? <Button type="link" onClick={this.resetTab} style={group.resetButton.style}>{group.resetButton.label}</Button> : null}
           {group.closeButton && group.closeButton.enable === 'true' ? <Button type="link" onClick={this.closeTab} style={group.closeButton.style}>{group.closeButton.label}</Button> : null}
         </div> : null}
       </div>

--
Gitblit v1.8.0