2021-09-08

king

2021-09-08 0e4c25700fac0e0c7d93327a5eaafc17b8dd3d78

2021-09-08

 src/components/header/index.jsx

@@ -22,14 +22,12 @@
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
import avatar from '@/assets/img/avatar.jpg'
import asyncComponent from '@/utils/asyncComponent'
import Resetpwd from './resetpwd'
import LoginForm from './loginform'
import './index.scss'

const { confirm } = Modal
const { Search } = Input
const VersionsUp = asyncComponent(() => import('./versions'))

class Header extends Component {
  static propTpyes = {
@@ -663,6 +661,37 @@
    }
  }

  verup = () => {
    confirm({
      title: '版本升级',
      content: '重新加载应用信息',
      onOk() {
        return new Promise(resolve => {
          if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
            notification.warning({
              top: 92,
              message: '升级失败，请刷新页面重试！',
              duration: 2
            })
            resolve()
          } else {
            Api.updateAppVersion()
            setTimeout(() => {
              notification.success({
                top: 92,
                message: '升级成功！',
                duration: 2
              })
              resolve()
            }, 1000)
          }
        })
      },
      onCancel() {}
    })
  }


  render () {
    const { mainMenu, collapse } = this.props
    const { thdMenuList, searchkey, debug, menulist, navBar, menuType } = this.state
@@ -680,8 +709,8 @@
          ))}
        </Menu.SubMenu> : null}
        <Menu.Item key="doc" onClick={this.gotoDoc}>{this.state.dict['main.doc']}</Menu.Item>
        <Menu.Item style={{padding: 0}} key="verup">
          <VersionsUp debug={debug} />
        <Menu.Item key="verup" onClick={this.verup}>
          版本升级
        </Menu.Item>
        <Menu.Item key="logout" onClick={this.logout}>{this.state.dict['main.logout']}</Menu.Item>
      </Menu>

 src/components/header/versions/settingform/index.jsx

File was deleted

 src/components/header/versions/settingform/index.scss

File was deleted

 src/views/design/header/index.jsx

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

const EditMenu = asyncComponent(() => import('@/templates/menuconfig/editfirstmenu'))
const VersionsUp = asyncComponent(() => import('./versions'))
const { confirm } = Modal

class Header extends Component {
@@ -375,6 +376,9 @@
              <Switch size="small" style={{marginLeft: '7px'}} disabled={!!editLevel} checked={true} onChange={this.changeEditState} />
            </Menu.Item>
            <Menu.Item key="doc" onClick={this.gotoDoc}>{this.state.dict['main.doc']}</Menu.Item>
            {options.sysType !== 'cloud' ? <Menu.Item style={{padding: 0}} key="verup">
              <VersionsUp />
            </Menu.Item> : null}
            <Menu.Item key="logout" onClick={this.logout}>{this.state.dict['main.logout']}</Menu.Item>
          </Menu>
        }>

 src/views/design/header/versions/index.jsx

File was renamed from src/components/header/versions/index.jsx
@@ -1,23 +1,17 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Modal, notification, Timeline, Icon, Button } from 'antd'
import { Modal, notification, Timeline, Icon, Button, Typography } from 'antd'
import moment from 'moment'
import md5 from 'md5'

// import SettingForm from './settingform'
import Api from '@/api'
import options from '@/store/options.js'
import Utils from '@/utils/utils.js'
import './index.scss'

const { confirm } = Modal
const { Paragraph } = Typography

class DataSource extends Component {
  static propTpyes = {
    debug: PropTypes.any
  }

  state = {
    visible: false,
    versions: null,
@@ -30,48 +24,6 @@
  }
  
  verup = () => {
    const { debug } = this.props

    if (!debug || options.sysType === 'cloud') {
      confirm({
        title: '版本升级',
        content: '重新加载应用信息',
        onOk() {
          return new Promise(resolve => {
            if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
              notification.warning({
                top: 92,
                message: '升级失败，请刷新页面重试！',
                duration: 2
              })
              resolve()
            } else {
              Api.updateAppVersion()
              setTimeout(() => {
                notification.success({
                  top: 92,
                  message: '升级成功！',
                  duration: 2
                })
                resolve()
              }, 1000)
            }
          })
        },
        onCancel() {}
      })
    } else {
      Api.updateAppVersion()

      if (!sessionStorage.getItem('CloudUserID') || !sessionStorage.getItem('CloudLoginUID')) {
        notification.warning({
          top: 92,
          message: '请登录开发机！',
          duration: 2
        })
        return
      }

      let _param = {
        func: 's_get_sversions_sys',
      }
@@ -160,7 +112,6 @@
          })
        })
      })
    }
  }

  queryScript = () => {
@@ -485,8 +436,8 @@
          ]}
          destroyOnClose
        >
          {versions ? <Timeline>
            {versions.map(item => {
          <Timeline>
            {versions && versions.map(item => {
              let icon = <Icon type="clock-circle-o" style={{ fontSize: '16px' }} />
              if (item.status === 'loading') {
                icon = <Icon type="sync" spin style={{ fontSize: '16px' }} />
@@ -498,10 +449,10 @@
                }
              }
              return (
                <Timeline.Item key={item.id} dot={icon}>{item.ProgramName}</Timeline.Item>
                <Timeline.Item key={item.id} dot={icon}>{item.ProgramName}（<Paragraph style={{display: 'inline-block', marginBottom: '0px'}} copyable>{item.id}</Paragraph>）</Timeline.Item>
              )
            })}
          </Timeline> : null}
          </Timeline>
        </Modal>
      </>
    )

 src/views/design/header/versions/index.scss