2019-12-26

king

2019-12-26 4c2ef2d3a98d7d9a2592721db2f5858528eb5c86

2019-12-26

 src/tabviews/commontable/index.jsx

@@ -4,9 +4,9 @@
import { BackTop, notification, Spin, Tabs, Icon, Card, Switch} from 'antd'
import moment from 'moment'
import Api from '@/api'
import MainSearch from './mainSearch'
import MainAction from './mainAction'
import MainTable from './mainTable'
import MainAction from '@/tabviews/tableshare/actionList'
import MainSearch from '@/tabviews/tableshare/topSearch'
import SubTable from '@/tabviews/subtable'
import NotFount from '@/components/404'
import zhCN from '@/locales/zh-CN/main.js'
@@ -556,6 +556,8 @@
        {actions && setting.onload !== 'false' ?
          <MainAction
            ref="mainButton"
            BID=""
            type="main"
            setting={setting}
            actions={actions}
            dict={this.state.dict}

 src/tabviews/commontable/mainSearch/index.jsx

File was deleted

 src/tabviews/commontable/mainSearch/index.scss

File was deleted

 src/tabviews/commontable/mutilform/index.jsx

File was deleted

 src/tabviews/commontable/mutilform/index.scss

File was deleted

 src/tabviews/home/index.jsx

@@ -35,7 +35,7 @@
      color: ['#1890ff'],
      tooltip : {
        trigger: 'axis',
        axisPointer : {            // 坐标轴指示器，坐标轴触发有效
        axisPointer : {    // 坐标轴指示器，坐标轴触发有效
          type : ''        // 默认为直线，可选为：'line' | 'shadow'
        }
      },
@@ -316,16 +316,11 @@
}

const mapStateToProps = (state) => {
  return {
    // tabviews: state.tabviews
  }
  return {}
}

const mapDispatchToProps = (dispatch) => {
  return {
    // refreshTabView: (refreshTab) => dispatch(refreshTabView(refreshTab)),
    // modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
  }
  return {}
}

export default connect(mapStateToProps, mapDispatchToProps)(Home)

 src/tabviews/subtable/index.jsx

@@ -4,9 +4,9 @@
import { notification, Spin} from 'antd'
import moment from 'moment'
import Api from '@/api'
import SubSearch from './subSearch'
import SubAction from './subAction'
import SubTable from './subTable'
import SubAction from '@/tabviews/tableshare/actionList'
import SubSearch from '@/tabviews/tableshare/topSearch'
import NotFount from '@/components/404'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
@@ -498,13 +498,14 @@
        {actions &&
          <SubAction
            ref="subButton"
            MenuID={this.props.SupMenuID}
            BID={this.props.BID}
            type="sub"
            setting={setting}
            actions={actions}
            BID={this.props.BID}
            dict={this.state.dict}
            MenuID={this.props.SupMenuID}
            refreshdata={this.refreshbyaction}
            gettableselected={this.gettableselected}
            actions={actions}
            dict={this.state.dict}
          />
        }
        {columns &&

 src/tabviews/subtable/subAction/index.jsx

File was deleted

 src/tabviews/subtable/subAction/index.scss

File was deleted

 src/tabviews/subtable/subTable/index.jsx

@@ -41,7 +41,6 @@
      }
      _columns.push(cell)
    })
    // {item.FieldName === 'MenuNo' ? <Icon onClick={(e) => {this.copycontent(e, record[item.FieldName])}} type="copy"/> : ''}

    this.setState({columns: _columns})
  }

 src/tabviews/tableshare/actionList/index.jsx

File was renamed from src/tabviews/commontable/mainAction/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import moment from 'moment'
import { Button, Affix, Modal, notification, Spin } from 'antd'
import MutilForm from '../mutilform'
import MutilForm from '@/tabviews/tableshare/mutilform'
import Utils from '@/utils/utils.js'
import Api from '@/api'
import './index.scss'
@@ -11,6 +11,8 @@

class MainAction extends Component {
  static propTpyes = {
    BID: PropTypes.string,
    type: PropTypes.string,
    MenuID: PropTypes.string,
    actions: PropTypes.array, // 搜索条件列表
    dict: PropTypes.object, // 字典项
@@ -26,6 +28,10 @@
    loadingUuid: '',
    btnloading: false,
    configMap: {}
  }

  UNSAFE_componentWillMount() {
    console.log(this.props.type)
  }
  
  refreshdata = (item, type) => {
@@ -120,7 +126,8 @@
        (btn.OpenType === 'pop' && !btn.innerFunc && btn.sql && btn.sqlType === 'insert')
      ) {
        let param = { // 系统存储过程
          func: 'sPC_TableData_InUpDe'
          func: 'sPC_TableData_InUpDe',
          BID: this.props.BID
        }

        if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') { // 是否弹框或直接执行
@@ -135,7 +142,6 @@
          }

          param.ID = ID
          param.BID = ''

          if (btn.innerFunc) {
            param.func = btn.innerFunc
@@ -159,18 +165,13 @@
            if (!param.hasOwnProperty('ID') && setting.primaryKey && data[0] && data[0][setting.primaryKey]) {
              param.ID = data[0][setting.primaryKey]
            }
            if (!param.hasOwnProperty('BID')) {
              param.BID = ''
            }
          } else if (btn.sql && btn.sqlType === 'insert') {
            param.ID = Utils.getguid()
            param.BID = ''
            param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata)) // 数据源
            param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
            param.secretkey = Utils.encrypt(param.LText, param.timestamp)
          } else if (btn.sql) {
            param.ID = data[0][setting.primaryKey]
            param.BID = ''
            param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata)) // 数据源
            param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
            param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -189,12 +190,12 @@
      } else if (btn.Ot === 'required' || (btn.Ot === 'requiredOnce' && btn.OpenType === 'pop')) {
        let deffers = data.map(cell => {
          let param = {
            func: 'sPC_TableData_InUpDe'
            func: 'sPC_TableData_InUpDe',
            BID: this.props.BID
          }

          if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') { // 是否弹框或直接执行
            param.ID = cell[setting.primaryKey]
            param.BID = ''

            if (btn.innerFunc) {
              param.func = btn.innerFunc
@@ -218,7 +219,6 @@
              }
            } else if (btn.sql) {
              param.ID = cell[setting.primaryKey]
              param.BID = ''
              param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata)) // 数据源
              param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
              param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -263,7 +263,7 @@
      /** *********************调用外部接口************************* */
      let param = {
        ID: '',
        BID: ''
        BID: this.props.BID
      }

      if (!btn.interface) { // 接口地址不存在时报错
@@ -359,7 +359,7 @@
          if (btn.innerFunc) {
            let deffers = data.map(cell => {
              let _param = {
                BID: '',
                BID: this.props.BID,
                func: btn.innerFunc
              }
              _param.ID = cell[setting.primaryKey]
@@ -393,7 +393,7 @@
          } else {
            let params = data.map(cell => {
              return {
                BID: '',
                BID: this.props.BID,
                ID: cell[setting.primaryKey]
              }
            })
@@ -781,7 +781,7 @@
  render() {
    const { loadingUuid, btnloading } = this.state

    if (this.props.setting.actionfixed) { // 按钮是否固定在头部
    if (this.props.setting.actionfixed && this.props.type === 'main') { // 按钮是否固定在头部
      return (
        <Affix offsetTop={48}>
          <div className="button-list" id={this.props.MenuID + 'mainaction'}>

 src/tabviews/tableshare/actionList/index.scss

 src/tabviews/tableshare/mutilform/index.jsx

 src/tabviews/tableshare/mutilform/index.scss

 src/tabviews/tableshare/topSearch/index.jsx

 src/tabviews/tableshare/topSearch/index.scss

 src/templates/comtableconfig/index.jsx

@@ -6,19 +6,19 @@
import HTML5Backend from 'react-dnd-html5-backend'
import { Button, Card, Modal, Collapse, notification, Spin, Select, List, Icon, Empty, Switch, Tooltip } from 'antd'
import moment from 'moment'
import DragElement from './dragelement'
import TabDragElement from './tabdragelement'
import SourceElement from './dragelement/source'
import Api from '@/api'
import TabForm from './tabform'
import SearchForm from './searchform'
import ActionForm from './actionform'
import ColumnForm from './columnform'
import ColspanForm from './colspanform'
import SettingForm from './settingform'
import GridBtnForm from './gridbtnform'
import EditCard from './editcard'
import MenuForm from './menuform'
import TabForm from './tabform'
import TabDragElement from './tabdragelement'
import Api from '@/api'
import SearchForm from '@/templates/tableshare/searchform'
import ColumnForm from '@/templates/tableshare/columnform'
import DragElement from '@/templates/tableshare/dragelement'
import ColspanForm from '@/templates/tableshare/colspanform'
import GridBtnForm from '@/templates/tableshare/gridbtnform'
import EditCard from '@/templates/tableshare/editcard'
import MenuForm from '@/templates/tableshare/menuform'
import SourceElement from '@/templates/tableshare/dragelement/source'
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'

 src/templates/comtableconfig/menuform/index.jsx

File was deleted

 src/templates/subtableconfig/colspanform/index.jsx

File was deleted

 src/templates/subtableconfig/colspanform/index.scss

File was deleted

 src/templates/subtableconfig/columnform/index.jsx

File was deleted

 src/templates/subtableconfig/columnform/index.scss

File was deleted

 src/templates/subtableconfig/dragelement/card.jsx

File was deleted

 src/templates/subtableconfig/dragelement/index.jsx

File was deleted

 src/templates/subtableconfig/dragelement/index.scss

File was deleted

 src/templates/subtableconfig/dragelement/itemtypes.js

File was deleted

 src/templates/subtableconfig/dragelement/source.jsx

File was deleted

 src/templates/subtableconfig/editable/index.jsx

File was deleted

 src/templates/subtableconfig/editable/index.scss

File was deleted

 src/templates/subtableconfig/editcard/index.jsx

File was deleted

 src/templates/subtableconfig/editcard/index.scss

File was deleted

 src/templates/subtableconfig/gridbtnform/index.jsx

File was deleted

 src/templates/subtableconfig/gridbtnform/index.scss

File was deleted

 src/templates/subtableconfig/index.jsx

@@ -6,17 +6,17 @@
import HTML5Backend from 'react-dnd-html5-backend'
import { Button, Card, Modal, Collapse, notification, Spin, Select, List, Icon, Empty, Switch, Tooltip } from 'antd'
import moment from 'moment'
import DragElement from './dragelement'
import SourceElement from './dragelement/source'
import Api from '@/api'
import SearchForm from './searchform'
import ActionForm from './actionform'
import ColumnForm from './columnform'
import ColspanForm from './colspanform'
import SettingForm from './settingform'
import GridBtnForm from './gridbtnform'
import EditCard from './editcard'
import MenuForm from './menuform'
import SearchForm from '@/templates/tableshare/searchform'
import ColumnForm from '@/templates/tableshare/columnform'
import DragElement from '@/templates/tableshare/dragelement'
import ColspanForm from '@/templates/tableshare/colspanform'
import GridBtnForm from '@/templates/tableshare/gridbtnform'
import EditCard from '@/templates/tableshare/editcard'
import MenuForm from '@/templates/tableshare/menuform'
import SourceElement from '@/templates/tableshare/dragelement/source'
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'

 src/templates/subtableconfig/menuform/index.scss

 src/templates/subtableconfig/searchform/index.jsx

File was deleted

 src/templates/subtableconfig/searchform/index.scss

File was deleted

 src/templates/subtableconfig/transferform/index.jsx

File was deleted

 src/templates/subtableconfig/transferform/index.scss

File was deleted

 src/templates/tableshare/colspanform/index.jsx

 src/templates/tableshare/colspanform/index.scss

 src/templates/tableshare/columnform/index.jsx

 src/templates/tableshare/columnform/index.scss

 src/templates/tableshare/dragelement/card.jsx

 src/templates/tableshare/dragelement/index.jsx

 src/templates/tableshare/dragelement/index.scss

 src/templates/tableshare/dragelement/itemtypes.js

 src/templates/tableshare/dragelement/source.jsx

 src/templates/tableshare/editable/index.jsx

 src/templates/tableshare/editable/index.scss

 src/templates/tableshare/editcard/index.jsx

 src/templates/tableshare/editcard/index.scss

 src/templates/tableshare/gridbtnform/index.jsx

 src/templates/tableshare/gridbtnform/index.scss

 src/templates/tableshare/menuform/index.jsx

File was renamed from src/templates/subtableconfig/menuform/index.jsx
@@ -11,7 +11,6 @@

  getFields() {
    const { getFieldDecorator } = this.props.form

    const fields = []
    this.props.formlist.forEach((item, index) => {
      if (item.type === 'text') { // 文本搜索

 src/templates/tableshare/menuform/index.scss

 src/templates/tableshare/searchform/index.jsx

 src/templates/tableshare/searchform/index.scss

 src/templates/tableshare/transferform/index.jsx

 src/templates/tableshare/transferform/index.scss