Merge branch 'develop'

king

2022-08-02 8d66ff34fae5b048a6b7923cc75d34f13a08be9d

 src/templates/sharecomponent/treesettingcomponent/index.jsx

@@ -6,6 +6,7 @@
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import SettingForm from './settingform'
import MKEmitter from '@/utils/events.js'

import './index.scss'

@@ -34,6 +35,7 @@
      visible: true,
      menu: menu
    })
    MKEmitter.emit('modalStatus', '数据源')
  }

  /**
@@ -62,7 +64,16 @@
        loading: false
      })

      res.show = config.setting.show || 'true'
      res.advanceType = config.setting.advanceType || 'modal'
      res.advanceWidth = config.setting.advanceWidth || 1000
      res.drawerPlacement = config.setting.drawerPlacement || 'right'
      res.searchRatio = config.setting.searchRatio || 6
      res.searchLwidth = config.setting.searchLwidth !== undefined ? config.setting.searchLwidth : 33.3

      this.props.updatesetting({...config, setting: res})

      MKEmitter.emit('modalStatus', false)
    }, () => {
      this.setState({
        loading: false
@@ -89,11 +100,11 @@
        {/* 设置全局配置及列表数据源 */}
        <Modal
          wrapClassName="model-tree-setting-verify-modal"
          title={dict['model.edit']}
          title="数据源配置"
          visible={visible}
          width={900}
          maskClosable={false}
          onCancel={() => { this.setState({ visible: false })}}
          onCancel={() => { MKEmitter.emit('modalStatus', false); this.setState({ visible: false })}}
          confirmLoading={loading}
          onOk={this.settingSave}
          destroyOnClose