2020-03-18

king

2020-03-18 aaee2aa047e856141dce84c5d3f1cd16d9a00dcd

2020-03-18

 src/components/sidemenu/config.js

@@ -38,6 +38,14 @@
      text: '版本升级'
    }, {
      src: '',
      PageParam: {OpenType: 'newtab', Template: 'TabManage'},
      type: 'TabManage',
      MenuID: 'TabManageView',
      MenuNo: 'TabManage',
      MenuName: '标签页管理',
      text: '标签页管理'
    }, {
      src: '',
      PageParam: {OpenType: 'newtab', Template: 'ManageTable'},
      type: 'ManageTable',
      MenuID: '1578900109100np8aqd0a77q3na46oas',

 src/components/tabview/index.jsx

@@ -18,7 +18,8 @@

const Home = asyncComponent(() => import('@/tabviews/home'))
const CommonTable = asyncComponent(() => import('@/tabviews/commontable'))
const VerupTable = asyncComponent(() => import('@/tabviews/verup'))
const VerupTable = asyncComponent(() => import('@/tabviews/verupmanage'))
const TabManage = asyncComponent(() => import('@/tabviews/tabmanage'))
const ManageTable = asyncComponent(() => import('@/tabviews/managetable'))
const Iframe = asyncComponent(() => import('@/tabviews/iframe'))
const DataManage = asyncComponent(() => import('@/tabviews/datamanage'))
@@ -102,6 +103,8 @@
      return (<CommonTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
    } else if (view.type === 'VerupTable') {
      return (<VerupTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
    } else if (view.type === 'TabManage') {
      return (<TabManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
    } else if (view.type === 'ManageTable') {
      return (<ManageTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
    } else if (view.type === 'DataManage') {

 src/tabviews/commontable/index.jsx

@@ -9,18 +9,16 @@
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
// import asyncComponent from '@/utils/asyncComponent'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import {refreshTabView, modifyTabview} from '@/store/action'

import MainTable from '@/tabviews/tableshare/normalTable'
import MainAction from '@/tabviews/tableshare/actionList'
import VerifyCard from '@/tabviews/tableshare/verifycard'
import MainSearch from '@/tabviews/tableshare/topSearch'
import MainTable from '@/tabviews/zshare/normalTable'
import MainAction from '@/tabviews/zshare/actionList'
import VerifyCard from '@/tabviews/zshare/verifycard'
import MainSearch from '@/tabviews/zshare/topSearch'
import NotFount from '@/components/404'
import './index.scss'

// const MainAction = asyncComponent(() => import('@/tabviews/tableshare/actionList'))
const SubTable = asyncLoadComponent(() => import('@/tabviews/subtable'))
const SubTabTable = asyncLoadComponent(() => import('@/tabviews/subtabtable'))
const FormTab = asyncLoadComponent(() => import('@/tabviews/formtab'))

 src/tabviews/formtab/formgroup/index.jsx

@@ -5,7 +5,7 @@
import moment from 'moment'
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import FileUpload from '@/tabviews/tableshare/fileupload'
import FileUpload from '@/tabviews/zshare/fileupload'
import './index.scss'

const {MonthPicker} = DatePicker

 src/tabviews/managetable/index.jsx

@@ -14,9 +14,9 @@
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import {refreshTabView, modifyTabview} from '@/store/action'

import MainTable from '@/tabviews/tableshare/normalTable'
import MainAction from '@/tabviews/tableshare/actionList'
import MainSearch from '@/tabviews/tableshare/topSearch'
import MainTable from '@/tabviews/zshare/normalTable'
import MainAction from '@/tabviews/zshare/actionList'
import MainSearch from '@/tabviews/zshare/topSearch'
import NotFount from '@/components/404'
import './index.scss'


 src/tabviews/subtable/index.jsx

@@ -11,9 +11,9 @@
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'

import SubTable from '@/tabviews/tableshare/normalTable'
import SubAction from '@/tabviews/tableshare/actionList'
import SubSearch from '@/tabviews/tableshare/topSearch'
import SubTable from '@/tabviews/zshare/normalTable'
import SubAction from '@/tabviews/zshare/actionList'
import SubSearch from '@/tabviews/zshare/topSearch'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'


 src/tabviews/subtabtable/index.jsx

@@ -11,9 +11,9 @@
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'

import SubTable from '@/tabviews/tableshare/normalTable'
import SubAction from '@/tabviews/tableshare/actionList'
import SubSearch from '@/tabviews/tableshare/topSearch'
import SubTable from '@/tabviews/zshare/normalTable'
import SubAction from '@/tabviews/zshare/actionList'
import SubSearch from '@/tabviews/zshare/topSearch'
import NotFount from '@/components/404'

import './index.scss'

 src/tabviews/tabmanage/config.js

New file
@@ -0,0 +1,4 @@
// 版本升级页面配置
export const verupMainTable = {
  
}

 src/tabviews/tabmanage/index.jsx

New file
@@ -0,0 +1,57 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
// import { notification, Tabs, Icon, Switch } from 'antd'
// import moment from 'moment'

// import Api from '@/api'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
// import options from '@/store/options.js'
// import { verupMainTable } from './config.js'

import './index.scss'

class TabManage extends Component {
  static propTpyes = {
    MenuNo: PropTypes.string,    // 菜单参数
    MenuName: PropTypes.string,  // 菜单参数
    MenuID: PropTypes.string     // 菜单Id
  }

  state = {
    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
    ContainerId: Utils.getuuid() // 菜单外层html Id
  }


  UNSAFE_componentWillMount () {

  }

  shouldComponentUpdate (nextProps, nextState) {
    return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
  }

  /**
   * @description 组件销毁，清除state更新
   */
  componentWillUnmount () {
    this.setState = () => {
      return
    }
  }

  render() {
    // const {  } = this.state

    return (
      <div className="tab-manage" id={this.state.ContainerId}>
        
      </div>
    )
  }
}

export default TabManage

 src/tabviews/tabmanage/index.scss

New file
@@ -0,0 +1,3 @@
.tab-manage {
  
}

 src/tabviews/verupmanage/actionList/index.jsx

File was renamed from src/tabviews/verup/actionList/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import moment from 'moment'
import { Button, Modal, notification, message } from 'antd'
import MutilForm from '@/tabviews/tableshare/mutilform'
import MutilForm from '@/tabviews/zshare/mutilform'
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
import Api from '@/api'

 src/tabviews/verupmanage/actionList/index.scss

 src/tabviews/verupmanage/config.js

 src/tabviews/verupmanage/index.jsx

File was renamed from src/tabviews/verup/index.jsx
@@ -12,7 +12,7 @@
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import { verupMainTable, buttonConfig } from './config.js'

import MainTable from '@/tabviews/tableshare/normalTable'
import MainTable from '@/tabviews/zshare/normalTable'
import TopSearch from './topSearch'
import MainAction from './actionList'
import './index.scss'

 src/tabviews/verupmanage/index.scss

 src/tabviews/verupmanage/subtabtable/index.jsx

File was renamed from src/tabviews/verup/subtabtable/index.jsx
@@ -11,7 +11,7 @@
import options from '@/store/options.js'
import { buttonConfig, tabConfig } from '../config.js'

import SubTable from '@/tabviews/tableshare/normalTable'
import SubTable from '@/tabviews/zshare/normalTable'
import SubAction from '../actionList'
import SubSearch from '../topSearch'


 src/tabviews/verupmanage/subtabtable/index.scss

 src/tabviews/verupmanage/topSearch/index.jsx

 src/tabviews/verupmanage/topSearch/index.scss

 src/tabviews/zshare/actionList/index.jsx

File was renamed from src/tabviews/tableshare/actionList/index.jsx
@@ -3,7 +3,7 @@
import moment from 'moment'
import { Button, Affix, Modal, notification, Spin, message } from 'antd'
import * as XLSX from 'xlsx'
import MutilForm from '@/tabviews/tableshare/mutilform'
import MutilForm from '@/tabviews/zshare/mutilform'
import ExcelIn from '../excelin'
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'

 src/tabviews/zshare/actionList/index.scss

 src/tabviews/zshare/excelin/index.jsx

 src/tabviews/zshare/excelin/index.scss

 src/tabviews/zshare/fileupload/index.jsx

 src/tabviews/zshare/fileupload/index.scss

 src/tabviews/zshare/mutilform/index.jsx

 src/tabviews/zshare/mutilform/index.scss

 src/tabviews/zshare/normalTable/index.jsx

 src/tabviews/zshare/normalTable/index.scss

 src/tabviews/zshare/topSearch/index.jsx

 src/tabviews/zshare/topSearch/index.scss

 src/tabviews/zshare/verifycard/actionform/index.jsx

 src/tabviews/zshare/verifycard/actionform/index.scss

 src/tabviews/zshare/verifycard/index.jsx

 src/tabviews/zshare/verifycard/index.scss

 src/templates/comtableconfig/index.jsx

@@ -11,28 +11,28 @@
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import { getSearchForm, getActionForm, getColumnForm } from '@/templates/tableshare/formconfig'
import { getSearchForm, getActionForm, getColumnForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'

import ActionForm from './actionform'
import SettingForm from './settingform'
import TabForm from '@/templates/tableshare/tabform'
import SearchForm from '@/templates/tableshare/searchform'
import ColumnForm from '@/templates/tableshare/columnform'
import PasteForm from '@/templates/tableshare/pasteform'
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 VerifyCard from '@/templates/tableshare/verifycard'
import VerifyCardExcelIn from '@/templates/tableshare/verifycardexcelin'
import VerifyCardExcelOut from '@/templates/tableshare/verifycardexcelout'
import VerifyCardPrint from '@/templates/tableshare/verifycardprint'
import MenuForm from '@/templates/tableshare/menuform'
import TabDragElement from '@/templates/tableshare/tabdragelement'
import TabForm from '@/templates/zshare/tabform'
import SearchForm from '@/templates/zshare/searchform'
import ColumnForm from '@/templates/zshare/columnform'
import PasteForm from '@/templates/zshare/pasteform'
import DragElement from '@/templates/zshare/dragelement'
import ColspanForm from '@/templates/zshare/colspanform'
import GridBtnForm from '@/templates/zshare/gridbtnform'
import EditCard from '@/templates/zshare/editcard'
import VerifyCard from '@/templates/zshare/verifycard'
import VerifyCardExcelIn from '@/templates/zshare/verifycardexcelin'
import VerifyCardExcelOut from '@/templates/zshare/verifycardexcelout'
import VerifyCardPrint from '@/templates/zshare/verifycardprint'
import MenuForm from '@/templates/zshare/menuform'
import TabDragElement from '@/templates/zshare/tabdragelement'
import TransferForm from '@/components/transferform'
import SourceElement from '@/templates/tableshare/dragelement/source'
import CreateFunc from '@/templates/tableshare/createfunc'
import SourceElement from '@/templates/zshare/dragelement/source'
import CreateFunc from '@/templates/zshare/createfunc'
import Source from './source'
import './index.scss'


 src/templates/formtabconfig/index.jsx

@@ -11,21 +11,21 @@
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'
import { getModalForm, getActionForm } from '@/templates/tableshare/formconfig'
import { getModalForm, getActionForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'

import ModalForm from '@/templates/ushare/modalform'
import ModalForm from '@/templates/zshare/modalform'
import ActionForm from './actionform'
import SettingForm from './settingform'
import DragElement from './dragelement'
import GroupForm from './groupform'
import TabForm from '@/templates/tableshare/tabform'
import EditCard from '@/templates/tableshare/editcard'
import VerifyCard from '@/templates/tableshare/verifycard'
import MenuForm from '@/templates/tableshare/menuform'
import TabDragElement from '@/templates/tableshare/tabdragelement'
import SourceElement from '@/templates/tableshare/dragelement/source'
import CreateFunc from '@/templates/tableshare/createfunc'
import TabForm from '@/templates/zshare/tabform'
import EditCard from '@/templates/zshare/editcard'
import VerifyCard from '@/templates/zshare/verifycard'
import MenuForm from '@/templates/zshare/menuform'
import TabDragElement from '@/templates/zshare/tabdragelement'
import SourceElement from '@/templates/zshare/dragelement/source'
import CreateFunc from '@/templates/zshare/createfunc'
import Source from './source'
import './index.scss'


 src/templates/modalconfig/index.jsx

@@ -10,10 +10,10 @@
import zhCN from '@/locales/zh-CN/comtable.js'
import Utils from '@/utils/utils.js'
import enUS from '@/locales/en-US/comtable.js'
import { getModalForm } from '@/templates/tableshare/formconfig'
import { getModalForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'

import ModalForm from '@/templates/ushare/modalform'
import ModalForm from '@/templates/zshare/modalform'
import DragElement from './dragelement'
import SourceElement from './dragelement/source'
import SettingForm from './settingform'

 src/templates/subtableconfig/index.jsx

@@ -11,25 +11,25 @@
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'
import { getSearchForm, getActionForm, getColumnForm } from '@/templates/tableshare/formconfig'
import { getSearchForm, getActionForm, getColumnForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'

import ActionForm from './actionform'
import SettingForm from './settingform'
import SearchForm from '@/templates/tableshare/searchform'
import ColumnForm from '@/templates/tableshare/columnform'
import DragElement from '@/templates/tableshare/dragelement'
import PasteForm from '@/templates/tableshare/pasteform'
import ColspanForm from '@/templates/tableshare/colspanform'
import GridBtnForm from '@/templates/tableshare/gridbtnform'
import EditCard from '@/templates/tableshare/editcard'
import VerifyCard from '@/templates/tableshare/verifycard'
import VerifyCardExcelIn from '@/templates/tableshare/verifycardexcelin'
import VerifyCardExcelOut from '@/templates/tableshare/verifycardexcelout'
import MenuForm from '@/templates/tableshare/menuform'
import SearchForm from '@/templates/zshare/searchform'
import ColumnForm from '@/templates/zshare/columnform'
import DragElement from '@/templates/zshare/dragelement'
import PasteForm from '@/templates/zshare/pasteform'
import ColspanForm from '@/templates/zshare/colspanform'
import GridBtnForm from '@/templates/zshare/gridbtnform'
import EditCard from '@/templates/zshare/editcard'
import VerifyCard from '@/templates/zshare/verifycard'
import VerifyCardExcelIn from '@/templates/zshare/verifycardexcelin'
import VerifyCardExcelOut from '@/templates/zshare/verifycardexcelout'
import MenuForm from '@/templates/zshare/menuform'
import TransferForm from '@/components/transferform'
import SourceElement from '@/templates/tableshare/dragelement/source'
import CreateFunc from '@/templates/tableshare/createfunc'
import SourceElement from '@/templates/zshare/dragelement/source'
import CreateFunc from '@/templates/zshare/createfunc'
import Source from './source'
import './index.scss'


 src/templates/zshare/colspanform/index.jsx

 src/templates/zshare/colspanform/index.scss

 src/templates/zshare/columnform/index.jsx

 src/templates/zshare/columnform/index.scss

 src/templates/zshare/createfunc/index.jsx

 src/templates/zshare/createfunc/index.scss

 src/templates/zshare/dragelement/card.jsx

 src/templates/zshare/dragelement/index.jsx

 src/templates/zshare/dragelement/index.scss

 src/templates/zshare/dragelement/itemtypes.js

 src/templates/zshare/dragelement/source.jsx

 src/templates/zshare/dragelform/card.jsx

 src/templates/zshare/dragelform/index.jsx

 src/templates/zshare/dragelform/index.scss

 src/templates/zshare/dragelform/itemtypes.js

 src/templates/zshare/dragelform/source.jsx

 src/templates/zshare/editcard/index.jsx

 src/templates/zshare/editcard/index.scss

 src/templates/zshare/exceleditable/index.jsx

 src/templates/zshare/exceleditable/index.scss

 src/templates/zshare/formconfig.js

 src/templates/zshare/gridbtnform/index.jsx

 src/templates/zshare/gridbtnform/index.scss

 src/templates/zshare/menuform/index.jsx

 src/templates/zshare/menuform/index.scss

 src/templates/zshare/modaleditable/index.jsx

File was renamed from src/templates/ushare/editable/index.jsx
@@ -38,7 +38,6 @@
        return
      }
      this.toggleEdit()
      // handleSave({ ...record, ...values })
    })
  }


 src/templates/zshare/modaleditable/index.scss

 src/templates/zshare/modalform/index.jsx

File was renamed from src/templates/ushare/modalform/index.jsx
@@ -3,7 +3,7 @@
import { Form, Row, Col, Input, Select, Icon, Radio, notification, InputNumber, Tooltip } from 'antd'
import { formRule } from '@/utils/option.js'
import { dateOptions } from '@/utils/option.js'
import EditTable from '../editable'
import EditTable from '../modaleditable'
import './index.scss'

const { TextArea } = Input

 src/templates/zshare/modalform/index.scss

 src/templates/zshare/pasteform/index.jsx

 src/templates/zshare/pasteform/index.scss

 src/templates/zshare/searcheditable/index.jsx

File was renamed from src/templates/tableshare/editable/index.jsx
@@ -22,7 +22,9 @@
  toggleEdit = () => {
    const editing = !this.state.editing
    this.setState({ editing }, () => {
      if (editing) {
      if (editing && this.input && this.input.select) {
        this.input.select()
      } else if (editing && this.input && this.input.focus) {
        this.input.focus()
      }
    })
@@ -36,7 +38,6 @@
        return
      }
      this.toggleEdit()
      // handleSave({ ...record, ...values })
    })
  }


 src/templates/zshare/searcheditable/index.scss

 src/templates/zshare/searchform/index.jsx

File was renamed from src/templates/tableshare/searchform/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber } from 'antd'
import { dateOptions, matchReg, formRule } from '@/utils/option.js'
import EditTable from '../editable'
import EditTable from '../searcheditable'
import './index.scss'

const { TextArea } = Input

 src/templates/zshare/searchform/index.scss

 src/templates/zshare/tabdragelement/card.jsx

 src/templates/zshare/tabdragelement/index.jsx

 src/templates/zshare/tabdragelement/index.scss

 src/templates/zshare/tabform/index.jsx

 src/templates/zshare/tabform/index.scss

 src/templates/zshare/transferform/index.jsx

 src/templates/zshare/transferform/index.scss

 src/templates/zshare/verifycard/billcodeform/index.jsx

 src/templates/zshare/verifycard/billcodeform/index.scss

 src/templates/zshare/verifycard/contrastform/index.jsx

 src/templates/zshare/verifycard/contrastform/index.scss

 src/templates/zshare/verifycard/customform/index.jsx

 src/templates/zshare/verifycard/customform/index.scss

 src/templates/zshare/verifycard/customscript/index.jsx

 src/templates/zshare/verifycard/customscript/index.scss

 src/templates/zshare/verifycard/index.jsx

 src/templates/zshare/verifycard/index.scss

 src/templates/zshare/verifycard/uniqueform/index.jsx

 src/templates/zshare/verifycard/uniqueform/index.scss

 src/templates/zshare/verifycard/voucherform/index.jsx

 src/templates/zshare/verifycard/voucherform/index.scss

 src/templates/zshare/verifycardexcelin/columnform/index.jsx

 src/templates/zshare/verifycardexcelin/columnform/index.scss

 src/templates/zshare/verifycardexcelin/customscript/index.jsx

 src/templates/zshare/verifycardexcelin/customscript/index.scss

 src/templates/zshare/verifycardexcelin/index.jsx

 src/templates/zshare/verifycardexcelin/index.scss

 src/templates/zshare/verifycardexcelout/columnform/index.jsx

 src/templates/zshare/verifycardexcelout/columnform/index.scss

 src/templates/zshare/verifycardexcelout/index.jsx

 src/templates/zshare/verifycardexcelout/index.scss

 src/templates/zshare/verifycardprint/index.jsx

 src/templates/zshare/verifycardprint/index.scss

 src/views/login/index.jsx

@@ -13,7 +13,6 @@
import './index.scss'

const LoginForm = asyncComponent(() => import('./loginform'))
// const Action = asyncComponent(() => import('@/tabviews/tableshare/actionList'))
const iszhCN = !localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN'

class Login extends Component {
@@ -29,8 +28,7 @@
    ICP: window.GLOB.icp || 'ICP备案： 京ICP备12007830号',
    bgColor: window.GLOB.bgColor || '#000000',
    lineColor: window.GLOB.lineColor || '#1890ff',
    website: window.GLOB.website || (!window.GLOB.copyRight && 'http://minkesoft.com'),
    loaded: false
    website: window.GLOB.website || (!window.GLOB.copyRight && 'http://minkesoft.com')
  }

  changelang (item) {
@@ -144,7 +142,6 @@
            isDisabled={this.state.isDisabled}
            changelang={(value) => this.changelang(value)}
            handleSubmit={() => this.handleSubmit()}
            loaded={() => this.setState({ loaded: true })}
            wrappedComponentRef={(inst) => this.loginformRef = inst}
          />
        </div>
@@ -155,7 +152,6 @@
          }
          <p dangerouslySetInnerHTML={{ __html: this.state.ICP.replace(/\s/ig, '&nbsp;') }}></p>
        </div>
        {/* {this.state.loaded ? <div style={{position: 'fixed', bottom: '-1000px'}}><Action setting={{}} actions={[]} /></div> : null } */}
      </div>
    )
  }

 src/views/login/loginform.jsx

@@ -10,7 +10,6 @@
    isDisabled: PropTypes.bool,
    changelang: PropTypes.func,
    handleSubmit: PropTypes.func,
    loaded: PropTypes.func,
    dict: PropTypes.object,
    auth: PropTypes.bool,
    lang: PropTypes.string,
@@ -97,7 +96,6 @@
        input.focus()
      }
    }
    this.props.loaded()
  }

  render() {