2023-07-19

king

2023-07-19 0f66dca3d4b2a1f8de03546810692173be08146e

2023-07-19

 src/assets/css/main.scss

@@ -296,6 +296,12 @@
    border: 1px solid rgba(0, 0, 0, 0.07);
    background: rgba(0, 0, 0, 0);
  }
  .ant-modal-footer {
    .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
      color: var(--mk-sys-color);
      border-color: var(--mk-sys-color);
    }
  }
}

// 设置模态框样式，规定最大最小高度，重置滚动条
@@ -325,6 +331,17 @@
    border: 1px solid rgba(0, 0, 0, 0.07);
    background: rgba(0, 0, 0, 0);
  }

  .ant-modal-footer {
    .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
      color: var(--mk-sys-color);
      border-color: var(--mk-sys-color);
    }
    .ant-btn-primary {
      background-color: var(--mk-sys-color);
      border-color: var(--mk-sys-color);
    }
  }
}
.moveable-modal {
  overflow-x: hidden!important;

 src/assets/css/viewstyle.scss

@@ -8,33 +8,7 @@
// color8  8阶色
// color9  9阶色
// color10 10阶色
@mixin viewstyle($color1, $color2, $color3, $color4, $color5, $color6, $color7) {
  #root > .mk-main-view {
    >.mk-tabview-wrap {
      >.content-header {
        >.ant-tabs {
          >.ant-tabs-bar {
            .ant-tabs-tab:hover {
              color: $color5;
            }
            .ant-tabs-tab.ant-tabs-tab-active {
              color: $color6;
            }
            .ant-tabs-ink-bar {
              background-color: $color6;
            }
          }
        }
      }
    }
    >.mk-breadview-wrap {
      >.ant-breadcrumb {
        .anticon-redo:hover, .anticon-home:hover {
          color: $color5;
        }
      }
    }
  }
@mixin viewstyle($color1, $color2, $color3, $color4, $color5, $color6) {
  .custom-data-card-box, .custom-prop-card-box {
    .data-zoom.radio.active, .data-zoom.checkbox.active {
      .mk-card:not(.active):not(.selected):hover {
@@ -106,34 +80,6 @@
      }
    }
  }
  .normal-group-wrap {
    .print-button:hover, .print-button:focus, .print-button:active {
      color: $color5;
    }
  }
  // 搜索栏
  .mk-search-wrap {
    >.ant-row {
      .ant-col.search-button {
        .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link).active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):hover, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):focus {
          color: $color7;
          border-color: $color7;
        }
        .ant-btn-primary {
          background-color: $color6;
          border-color: $color6;
        }
        .ant-btn-link {
          color: $color6;
        }
      }
    }
    .advanced-list {
      .advance-value {
        color: $color6;
      }
    }
  }
  // 表格
  .normal-data-table, .normal-custom-table, .edit-custom-table {
    table {
@@ -156,34 +102,12 @@
      }
    }
  }
  // 弹窗按钮
  .popview-modal {
    .ant-modal-footer {
      .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
        color: $color7;
        border-color: $color7;
      }
    }
  }
  // 表单弹窗
  .action-modal {
    .ant-modal-footer {
      .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
        color: $color7;
        border-color: $color7;
      }
      .ant-btn-primary {
        background-color: $color6;
        border-color: $color6;
      }
    }
  }
  // 是否框
  .ant-modal-confirm-confirm {
    .ant-modal-confirm-btns {
      .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
        color: $color7;
        border-color: $color7;
        color: $color6;
        border-color: $color6;
      }
      .ant-btn-primary {
        background-color: $color6;
@@ -199,7 +123,7 @@
    background-color: $color6;
  }
  .ant-tabs-nav .ant-tabs-tab:active {
    color: $color7;
    color: $color6;
  }
  .ant-tabs-nav .ant-tabs-tab:hover {
    color: $color5;
@@ -313,16 +237,6 @@
    color: $color6;
  }

  .custom-tab-form-box .mk-normal-form-title.mkbtn {
    .form-title {
      color: $color6;
      border-color: $color6;
    }
    .form-title.active {
      background: $color6;
      color: #ffffff;
    }
  }
  .ant-input-search .ant-input-group-addon .ant-input-search-button {
    background-color: $color6;
    border-color: $color6;
@@ -396,7 +310,7 @@
  --mk-sys-color3: #91d5ff;
  --mk-sys-color4: #69c0ff;
  --mk-sys-color5: #40a9ff;
  @include viewstyle(#e6f7ff, #bae7ff, #91d5ff, #69c0ff, #40a9ff, #1890ff, #096dd9);
  @include viewstyle(#e6f7ff, #bae7ff, #91d5ff, #69c0ff, #40a9ff, #1890ff);
}

body[class*='mk-red-'] {
@@ -406,7 +320,7 @@
  --mk-sys-color3: #ffa39e;
  --mk-sys-color4: #ff7875;
  --mk-sys-color5: #ff4d4f;
  @include viewstyle(#fff1f0, #ffccc7, #ffa39e, #ff7875, #ff4d4f, #f5222d, #cf1322);
  @include viewstyle(#fff1f0, #ffccc7, #ffa39e, #ff7875, #ff4d4f, #f5222d);
}

body[class*='mk-orange-red-'] {
@@ -416,7 +330,7 @@
  --mk-sys-color3: #ffbb96;
  --mk-sys-color4: #ff9c6e;
  --mk-sys-color5: #ff7a45;
  @include viewstyle(#fff2e8, #ffd8bf, #ffbb96, #ff9c6e, #ff7a45, #fa541c, #d4380d);
  @include viewstyle(#fff2e8, #ffd8bf, #ffbb96, #ff9c6e, #ff7a45, #fa541c);
}

body[class*='mk-orange-'] {
@@ -426,7 +340,7 @@
  --mk-sys-color3: #ffd591;
  --mk-sys-color4: #ffc069;
  --mk-sys-color5: #ffa940;
  @include viewstyle(#fff7e6, #ffe7ba, #ffd591, #ffc069, #ffa940, #fa8c16, #d46b08);
  @include viewstyle(#fff7e6, #ffe7ba, #ffd591, #ffc069, #ffa940, #fa8c16);
}

body[class*='mk-orange-yellow-'] {
@@ -436,7 +350,7 @@
  --mk-sys-color3: #ffe58f;
  --mk-sys-color4: #ffd666;
  --mk-sys-color5: #ffc53d;
  @include viewstyle(#fffbe6, #fff1b8, #ffe58f, #ffd666, #ffc53d, #faad14, #d48806);
  @include viewstyle(#fffbe6, #fff1b8, #ffe58f, #ffd666, #ffc53d, #faad14);
}

body[class*='mk-yellow-'] {
@@ -446,7 +360,7 @@
  --mk-sys-color3: #fffb8f;
  --mk-sys-color4: #fff566;
  --mk-sys-color5: #ffec3d;
  @include viewstyle(#feffe6, #ffffb8, #fffb8f, #fff566, #ffec3d, #fadb14, #d4b106);
  @include viewstyle(#feffe6, #ffffb8, #fffb8f, #fff566, #ffec3d, #fadb14);
}

body[class*='mk-yellow-green-'] {
@@ -456,7 +370,7 @@
  --mk-sys-color3: #eaff8f;
  --mk-sys-color4: #d3f261;
  --mk-sys-color5: #bae637;
  @include viewstyle(#fcffe6, #f4ffb8, #eaff8f, #d3f261, #bae637, #a0d911, #7cb305);
  @include viewstyle(#fcffe6, #f4ffb8, #eaff8f, #d3f261, #bae637, #a0d911);
}

body[class*='mk-green-'] {
@@ -466,7 +380,7 @@
  --mk-sys-color3: #b7eb8f;
  --mk-sys-color4: #95de64;
  --mk-sys-color5: #73d13d;
  @include viewstyle(#f6ffed, #d9f7be, #b7eb8f, #95de64, #73d13d, #52c41a, #389e0d);
  @include viewstyle(#f6ffed, #d9f7be, #b7eb8f, #95de64, #73d13d, #52c41a);
}

body[class*='mk-cyan-'] {
@@ -476,7 +390,7 @@
  --mk-sys-color3: #87e8de;
  --mk-sys-color4: #5cdbd3;
  --mk-sys-color5: #36cfc9;
  @include viewstyle(#e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2, #08979c);
  @include viewstyle(#e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2);
}

body[class*='mk-blue-purple-'] {
@@ -486,7 +400,7 @@
  --mk-sys-color3: #adc6ff;
  --mk-sys-color4: #85a5ff;
  --mk-sys-color5: #597ef7;
  @include viewstyle(#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb, #1d39c4);
  @include viewstyle(#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb);
}

body[class*='mk-purple-'] {
@@ -496,7 +410,7 @@
  --mk-sys-color3: #d3adf7;
  --mk-sys-color4: #b37feb;
  --mk-sys-color5: #9254de;
  @include viewstyle(#f9f0ff, #efdbff, #d3adf7, #b37feb, #9254de, #722ed1, #531dab);
  @include viewstyle(#f9f0ff, #efdbff, #d3adf7, #b37feb, #9254de, #722ed1);
}

body[class*='mk-magenta-'] {
@@ -506,7 +420,7 @@
  --mk-sys-color3: #ffadd2;
  --mk-sys-color4: #ff85c0;
  --mk-sys-color5: #f759ab;
  @include viewstyle(#fff0f6, #ffd6e7, #ffadd2, #ff85c0, #f759ab, #eb2f96, #c41d7f);
  @include viewstyle(#fff0f6, #ffd6e7, #ffadd2, #ff85c0, #f759ab, #eb2f96);
}

body[class*='mk-grass-green-'] {
@@ -516,7 +430,7 @@
  --mk-sys-color3: #d9d26c;
  --mk-sys-color4: #ccc845;
  --mk-sys-color5: #bfbf22;
  @include viewstyle(#f2efda, #e6de97, #d9d26c, #ccc845, #bfbf22, #aeb303, #838c00);
  @include viewstyle(#f2efda, #e6de97, #d9d26c, #ccc845, #bfbf22, #aeb303);
}

body[class*='mk-deep-red-'] {
@@ -526,7 +440,7 @@
  --mk-sys-color3: #e89b9e;
  --mk-sys-color4: #db7077;
  --mk-sys-color5: #cf4856;
  @include viewstyle(#fff0f0, #f5cbcb, #e89b9e, #db7077, #cf4856, #c32539, #9c162c);
  @include viewstyle(#fff0f0, #f5cbcb, #e89b9e, #db7077, #cf4856, #c32539);
}

body[class*='mk-deep-blue-'] {
@@ -536,5 +450,5 @@
  --mk-sys-color3: #dbdfe6;
  --mk-sys-color4: #c6cede;
  --mk-sys-color5: #394c6f;
  @include viewstyle(#eff1f4, #e0e3e9, #dbdfe6, #c6cede, #394c6f, #1d3661, #1d3661);
  @include viewstyle(#eff1f4, #e0e3e9, #dbdfe6, #c6cede, #394c6f, #1d3661);
}

 src/components/breadview/index.jsx

@@ -153,7 +153,7 @@
    const { tabview, hasNavBar } = this.state

    return (
      <section id="mk-breadview-wrap" className="mk-breadview-wrap">
      <section id="mk-tabgroup-wrap" className="mk-breadview-wrap">
        {hasNavBar && tabview ? <Breadcrumb separator="">
          <Breadcrumb.Item>
            <HomeOutlined onClick={this.gotoHome} />

 src/components/breadview/index.scss

@@ -13,15 +13,16 @@
      cursor: pointer;
      margin-right: 5px;
    }
    .anticon-redo:hover, .anticon-home:hover {
      color: var(--mk-sys-color5);
    }
    .ant-breadcrumb-link + .ant-breadcrumb-separator {
      display: none;
    }
  }
  >.commontable, >.calendar-page {
  >.commontable {
    padding-left: 15px;
    padding-right: 15px;
  }
  >.commontable, >.calendar-page {
    > .mk-search-wrap {
      padding-left: 0;
      padding-right: 0;

 src/components/header/index.jsx

@@ -135,12 +135,9 @@

      window.GLOB.mkThdMenus = [...thdMenuList, {MenuID: 'home_page_id', EasyCode: '', MenuName: 'home', type: 'CustomPage'}]

      if (_menu) { // 延时打开，防止标签组未完成加载
        setTimeout(() => {
          MKEmitter.emit('modifyTabs', _menu)
        }, 200)
      if (_menu) {
        this.openTab(_menu, 0)
      }
      MKEmitter.emit('mkMenuLoaded')
    })
    
    // 获取角色权限, edition_type 接口版本控制 ''、'Y'、'A'
@@ -167,12 +164,26 @@
          })
        }

        MKEmitter.emit('mkActionLoaded')
        window.GLOB.mkActions = _permAction
      })
    }, 50)
  }

  openTab = (menu, times) => {
    if (times > 50) return
    times++

    let tabgroup = document.getElementById('mk-tabgroup-wrap')

    if (window.GLOB.mkActions.loaded && tabgroup) {
      MKEmitter.emit('modifyTabs', menu)
    } else {
      setTimeout(() => {
        this.openTab(times)
      }, 200)
    }
  }

  getMenulist = (result) => {
    let thdMenuList = []
    let menulist = []

 src/components/tabview/index.jsx

@@ -251,7 +251,7 @@
    const { tabviews, activeId } = this.state

    return (
      <section className={'mk-tabview-wrap' + (this.props.collapse ? ' collapsed' : '')}>
      <section id="mk-tabgroup-wrap" className={'mk-tabview-wrap' + (this.props.collapse ? ' collapsed' : '')}>
        <div className="content-header">
          {tabviews && tabviews.length > 0 &&
            <Tabs activeKey={activeId}>

 src/components/tabview/index.scss

@@ -47,6 +47,7 @@
          }
        }
        .ant-tabs-tab:hover {
          color: var(--mk-sys-color5);
          span.tab-control .anticon-close {
            display: inline-block;
          }
@@ -56,6 +57,12 @@
            display: inline-block;
          }
        }
        .ant-tabs-tab.ant-tabs-tab-active {
          color: var(--mk-sys-color);
        }
        .ant-tabs-ink-bar {
          background-color: var(--mk-sys-color);
        }
      }
      >.ant-tabs-content {
        height: 100%;

 src/tabviews/basetable/index.jsx

@@ -682,7 +682,7 @@
        {(loadingview || loading) ? <Spin className="view-spin" size="large" /> : null}
        <Row className="component-wrap">{this.getComponents()}</Row>
        {config && window.GLOB.breakpoint ? <DebugTable /> : null}
        {!window.GLOB.mkHS && config && autoMatic ? <AutoMatic autoMatic={autoMatic} config={config.components[0]} /> : null}
        {!window.GLOB.mkHS && config && autoMatic ? <AutoMatic autoMatic={autoMatic} tabId={config.MenuID} config={config.components[0]} /> : null}
        {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <TableNodes config={config} /> : null}
        {!window.GLOB.mkHS && config ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts || []}/> : null}
        {viewlost ? <NotFount msg={this.state.lostmsg} /> : null}

 src/tabviews/commontable/index.jsx

@@ -22,8 +22,8 @@
const SubTable = asyncSpinComponent(() => import('@/tabviews/subtable'))
const CardComponent = asyncSpinComponent(() => import('@/tabviews/zshare/cardcomponent'))
const ChartComponent = asyncSpinComponent(() => import('@/tabviews/zshare/chartcomponent'))
const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
const AutoMatic = asyncComponent(() => import('@/tabviews/zshare/automatic'))
// const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
// const AutoMatic = asyncComponent(() => import('@/tabviews/zshare/automatic'))
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))

const { TabPane } = Tabs
@@ -1006,7 +1006,7 @@

  render() {
    const { MenuID } = this.props
    const { BID, setting, pageSize, actions, columns, loadingview, viewlost, pickup, config, chartId, search, selectedData, shortcuts, autoMatic } = this.state
    const { BID, setting, pageSize, actions, columns, loadingview, viewlost, pickup, config, chartId, search, selectedData, shortcuts } = this.state

    return (
      <div className="commontable" id={this.state.ContainerId}>
@@ -1144,8 +1144,8 @@
          </Tabs>))
        }
        {setting && window.GLOB.breakpoint ? <DebugTable /> : null}
        {!window.GLOB.mkHS && autoMatic ? <AutoMatic autoMatic={autoMatic} config={config} /> : null}
        {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config}/> : null}
        {/* {!window.GLOB.mkHS && autoMatic ? <AutoMatic autoMatic={autoMatic} config={config} /> : null} */}
        {/* {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config}/> : null} */}
        {!window.GLOB.mkHS && setting ? <SettingComponent config={config} shortcuts={shortcuts || []}/> : null}
        {viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
      </div>

 src/tabviews/custom/components/card/cardcellList/asyncButtonComponent.jsx

File was deleted

 src/tabviews/custom/components/card/cardcellList/index.jsx

@@ -5,8 +5,7 @@
import moment from 'moment'

import Api from '@/api'
import asyncComponent from './asyncButtonComponent'
import asyncElementComponent from '@/utils/asyncComponent'
import asyncComponent from '@/utils/asyncComponent'
import { getMark } from '@/utils/utils.js'
import MkIcon from '@/components/mk-icon'
import Encrypts from '@/components/encrypts'
@@ -25,9 +24,9 @@
const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
const BarCode = asyncComponent(() => import('@/components/barcode'))
const QrCode = asyncComponent(() => import('@/components/qrcode'))
const MkProgress = asyncComponent(() => import('@/components/mkProgress'))
const Video = asyncComponent(() => import('@/components/video'))
const MkPicture = asyncComponent(() => import('@/components/mkPicture'))
const PicRadio = {

 src/tabviews/custom/components/form/tab-form/index.scss

@@ -24,12 +24,12 @@
  .mk-normal-form-title.mkbtn {
    .form-title {
      background: #ffffff;
      color: #1890ff;
      border: 1px solid #1890ff;
      color: var(--mk-sys-color);
      border: 1px solid var(--mk-sys-color);
      transition: all 0.3s;
    }
    .form-title.active {
      background: #1890ff;
      background: var(--mk-sys-color);
      color: #ffffff;
    }
    .form-title:first-child {

 src/tabviews/custom/components/group/normal-group/index.scss

@@ -7,6 +7,9 @@
    border: 0;
    background: transparent;
  }
  .print-button:hover, .print-button:focus, .print-button:active {
    color: var(--mk-sys-color5);
  }

  .group-header {
    position: relative;

 src/tabviews/home/index.jsx

@@ -4,7 +4,6 @@

import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
import './index.scss'

const DefaultHome = asyncComponent(() => import('./defaulthome'))
@@ -18,27 +17,14 @@
  state = {
    loading: true,
    background: sessionStorage.getItem('home_background'),
    waitMenu: true,
    waitAction: true,
    waiting: true,
    view: ''
  }

  componentDidMount () {
    this.loadHomeConfig()
    if (window.GLOB.mkThdMenus.length > 0) {
      this.setState({
        waitMenu: false
      })
    } else {
      MKEmitter.addListener('mkMenuLoaded', this.mkMenuLoaded)
    }
    if (window.GLOB.mkActions.loaded) {
      this.setState({
        waitAction: false
      })
    } else {
      MKEmitter.addListener('mkActionLoaded', this.mkActionLoaded)
    }

    this.check(0)
  }

  /**
@@ -48,20 +34,20 @@
    this.setState = () => {
      return
    }
    MKEmitter.removeListener('mkMenuLoaded', this.mkMenuLoaded)
    MKEmitter.removeListener('mkActionLoaded', this.mkActionLoaded)
  }

  mkMenuLoaded = () => {
    this.setState({
      waitMenu: false
    })
  }
  check = (times) => {
    times++

  mkActionLoaded = () => {
    this.setState({
      waitAction: false
    })
    if ((window.GLOB.mkThdMenus.length > 0 && window.GLOB.mkActions.loaded) || times > 50) {
      this.setState({
        waiting: false
      })
    } else {
      setTimeout(() => {
        this.check(times)
      }, 200)
    }
  }

  loadHomeConfig = () => {
@@ -84,8 +70,7 @@
          if (!config || !config.enabled) {
            this.setState({
              loading: false,
              waitMenu: false,
              waitAction: false,
              waiting: false,
              view: 'default'
            })
          } else {
@@ -97,16 +82,14 @@
        } else {
          this.setState({
            loading: false,
            waitMenu: false,
            waitAction: false,
            waiting: false,
            view: 'default'
          })
        }
      } else {
        this.setState({
          loading: false,
          waitMenu: false,
          waitAction: false,
          waiting: false,
          view: 'default'
        })
        notification.warning({
@@ -119,9 +102,9 @@
  }

  render() {
    const { loading, waitAction, waitMenu, view, background } = this.state
    const { loading, waiting, view, background } = this.state

    if (loading || waitAction || waitMenu) {
    if (loading || waiting) {
      return (<div className="home-loading-view" style={{background: background}}><Spin className="home-box-spin" size="large" /></div>)
    } else if (view === 'custom') {
      return (<CustomPage MenuID={this.props.MenuID} MenuName="首页"/>)

 src/tabviews/tabmanage/index.jsx

File was deleted

 src/tabviews/tabmanage/index.scss

File was deleted

 src/tabviews/tabmanage/mutilform/index.jsx

File was deleted

 src/tabviews/tabmanage/mutilform/index.scss

File was deleted

 src/tabviews/tabmanage/transferform/index.jsx

File was deleted

 src/tabviews/tabmanage/transferform/index.scss

File was deleted

 src/tabviews/zshare/automatic/index.jsx

@@ -9,6 +9,7 @@
class AutoMatic extends Component {
  static propTpyes = {
    autoMatic: PropTypes.object,
    tabId: PropTypes.string,
    config: PropTypes.object
  }

@@ -21,10 +22,18 @@
  timer = null

  UNSAFE_componentWillMount() {
    const { autoMatic } = this.props
    const { autoMatic, tabId } = this.props

    if (autoMatic.gap && autoMatic.gap >= 1) {
      this.setState({gap: autoMatic.gap * 1000})
    }

    if (tabId && tabId === sessionStorage.getItem('autoExecId')) {
      sessionStorage.removeItem('autoExecId')

      setTimeout(() => {
        this.trigger()
      }, 10000)
    }
  }

@@ -180,7 +189,7 @@
  }

  autoMaticOver = (MenuID) => {
    const { config, autoMatic } = this.props
    const { config, autoMatic, tabId } = this.props

    if (!this.state.running || MenuID !== config.MenuID) return

@@ -189,16 +198,24 @@
    if (autoMatic.onFinish !== 'over') {
      let interval = autoMatic.interval * 1000 || 10

      if (autoMatic.restart === 'first') {
        this.setState({line: 1})
      if (autoMatic.restart === 'refresh') {
        this.timer = setTimeout(() => {
          sessionStorage.setItem('ThirdMenu', tabId)
          sessionStorage.setItem('autoExecId', tabId)
          window.location.reload()
        }, interval)
      } else {
        this.setState({line: this.state.line + 1})
        if (autoMatic.restart === 'first') {
          this.setState({line: 1})
        } else {
          this.setState({line: this.state.line + 1})
        }
  
        this.timer = setTimeout(() => {
          this.setState({running: true})
          MKEmitter.emit('autoQueryData', config.MenuID, this.state.line)
        }, interval)
      }

      this.timer = setTimeout(() => {
        this.setState({running: true})
        MKEmitter.emit('autoQueryData', config.MenuID, this.state.line)
      }, interval)
    }
  }


 src/tabviews/zshare/topSearch/index.scss

@@ -64,6 +64,17 @@
        transform: rotate(180deg);
      }
    }
    .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link).active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):hover, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):focus {
      color: var(--mk-sys-color);
      border-color: var(--mk-sys-color);
    }
    .ant-btn-primary {
      background-color: var(--mk-sys-color);
      border-color: var(--mk-sys-color);
    }
    .ant-btn-link {
      color: var(--mk-sys-color);
    }
  }
  .advanced-list {
    font-size: 13px;
@@ -83,6 +94,9 @@
        padding: 2px;
      }
    }
    .advance-value {
      color: var(--mk-sys-color);
    }
  }
  .ant-calendar-picker-clear, .ant-calendar-picker-icon {
    right: 8px;

 src/templates/sharecomponent/settingcalcomponent/index.jsx

File was deleted

 src/templates/sharecomponent/settingcalcomponent/index.scss

File was deleted

 src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.jsx

File was deleted

 src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.scss

 src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx

File was deleted

 src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss

File was deleted

 src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx

File was deleted

 src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss

 src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx

File was deleted

 src/templates/zshare/unattended/settingform/index.jsx

@@ -160,6 +160,7 @@
                <Radio.Group>
                  <Radio value="first">第一行</Radio>
                  <Radio value="next">下一行</Radio>
                  <Radio value="refresh">刷新页面</Radio>
                </Radio.Group>
              )}
            </Form.Item>

 src/views/main/index.jsx

@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import { ConfigProvider } from 'antd'
import enUS from 'antd/es/locale/en_US'
// import enUS from 'antd/es/locale/en_US'
import zhCN from 'antd/es/locale/zh_CN'

import asyncComponent from '@/utils/asyncComponent'
@@ -14,7 +14,6 @@

const Tabview = asyncComponent(() => import('@/components/tabview'))
const Breadview = asyncComponent(() => import('@/components/breadview'))
const _locale = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS

class Main extends Component {
  state = {
@@ -63,7 +62,7 @@

    return (
      <div className="mk-main-view">
        <ConfigProvider locale={_locale}>
        <ConfigProvider locale={zhCN}>
          <Header key="header"/>
          {navBar === 'shutter' ? <Sidemenu key="sidemenu"/> : null}
          {navBar === 'shutter' || navBar === 'menu_board_navigation' ?

 src/views/mkiframe/index.jsx

@@ -1,5 +1,6 @@
import React, {Component} from 'react'
import { Spin, notification } from 'antd'
import { Spin, notification, ConfigProvider } from 'antd'
import zhCN from 'antd/es/locale/zh_CN'

import Api from '@/api'
import asyncComponent from '@/utils/asyncLoadComponent'
@@ -38,7 +39,7 @@
        localStorage.removeItem('getSysPermission')
        localStorage.removeItem('sysPermissions')

        if (window.GLOB.mkActions) {
        if (window.GLOB.mkActions && window.GLOB.mkActions.loaded) {
          this.setState({loading: false})
        } else {
          this.getPermRole()
@@ -176,9 +177,11 @@

    return (
      <div className="main-iframe">
        {loading ? <Spin size="large" /> : null}
        {!loading && type === 'CustomPage' ? <CustomPage MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
        {!loading && type === 'BaseTable' ? <BaseTable MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
        <ConfigProvider locale={zhCN}>
          {loading ? <Spin size="large" /> : null}
          {!loading && type === 'CustomPage' ? <CustomPage MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
          {!loading && type === 'BaseTable' ? <BaseTable MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
        </ConfigProvider>
      </div>
    )
  }