2020-12-31

king

2020-12-31 b2135fbd0b72d60f392bb75f0356aa727654d2f9

2020-12-31

 src/assets/mobimg/group.png

 src/components/tabview/index.jsx

@@ -237,7 +237,7 @@
                  <Tabs.TabPane
                    tab={
                      <span className="tab-control">
                        {['CommonTable', 'FormTab', 'TreePage', 'CalendarPage', 'CustomPage'].includes(view.type) ?
                        {['CommonTable', 'FormTab', 'TreePage', 'CalendarPage', 'CustomPage', 'ManageTable', 'VerupTable'].includes(view.type) ?
                          <Icon type="redo" onClick={(e) => {this.refreshTabview(e, view)}}/> : null
                        }
                        <span className="tab-name" onClick={(e) => {this.changeTab(e, view)}}>

 src/components/tabview/index.scss

@@ -25,7 +25,7 @@
          }
          span.tab-control i.anticon-redo {
            position: absolute;
            left: -5px;
            left: -3px;
            top: 18px;
            font-size: 14px;
            margin: 0px;

 src/index.js

@@ -70,9 +70,10 @@
    GLOB.filter = config.filter || ''

    if (config.externalDatabase !== false && config.externalDatabase !== 'false' && config.externalDatabase !== undefined) {
      GLOB.externalDatabase = config.externalDatabase || ''
      GLOB.externalDatabase = config.externalDatabase ? `[${config.externalDatabase}]..` : ''
    } else {
      GLOB.externalDatabase = null

    }

    // 只有业务系统才可以设置为正式系统

 src/menu/components/card/data-card/index.jsx

@@ -376,7 +376,7 @@
    }

    return (
      <div className="menu-data-card-edit-box" style={{...card.style, minHeight: card.wrap.minHeight}}>
      <div className="menu-data-card-edit-box" style={{...card.style}}>
        <NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
        <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
          <div className="mk-popover-control">

 src/menu/components/card/data-card/index.scss

@@ -5,7 +5,7 @@
  background-position: center center;
  background-repeat: no-repeat;
  background-size: cover;
  min-height: 100px;
  min-height: 20px;
  
  .card-control {
    position: absolute;
@@ -39,7 +39,7 @@
  }
  
  .card-item:hover {
    box-shadow: 0px 0px 2px #e8e8e8;
    box-shadow: 0px 0px 2px #1890ff;
  }

  .model-menu-card-cell-list .card-detail-row > .anticon-plus {
@@ -82,5 +82,6 @@
  clear: both;
}
.menu-data-card-edit-box:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/components/card/data-card/wrapsetting/settingform/index.jsx

@@ -197,18 +197,6 @@
                )}
              </Form.Item>
            </Col> : null}
            {config.subtype !== 'tablecard' ? <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="卡片外边框的最小高度，控制数据加载时组件的占位。">
                  <Icon type="question-circle" />
                  最小高度
                </Tooltip>
              }>
                {getFieldDecorator('minHeight', {
                  initialValue: wrap.minHeight || 100
                })(<InputNumber min={20} max={2000} precision={0} onPressEnter={this.handleSubmit} />)}
              </Form.Item>
            </Col> : null}
            {config.subtype === 'tablecard' ? <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="表格高度，超出时滚动，高度为空时根据内容自适应。">

 src/menu/components/card/prop-card/index.jsx

@@ -342,7 +342,7 @@
    }

    return (
      <div className="menu-prop-card-edit-box" style={{...card.style, minHeight: card.wrap.minHeight}}>
      <div className="menu-prop-card-edit-box" style={{...card.style}}>
        <NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
        <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
          <div className="mk-popover-control">

 src/menu/components/card/prop-card/index.scss

@@ -5,7 +5,7 @@
  background-position: center center;
  background-repeat: no-repeat;
  background-size: cover;
  min-height: 100px;
  min-height: 20px;
  
  .card-control {
    position: absolute;
@@ -39,7 +39,7 @@
  }
  
  .card-item:hover {
    box-shadow: 0px 0px 2px #e8e8e8;
    box-shadow: 0px 0px 2px #1890ff;
  }

  .model-menu-card-cell-list .card-detail-row > .anticon-plus {
@@ -72,5 +72,6 @@
  clear: both;
}
.menu-prop-card-edit-box:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/components/card/table-card/index.scss

@@ -55,7 +55,7 @@
  }
  
  .card-item:hover {
    box-shadow: 0px 0px 2px #e8e8e8;
    box-shadow: 0px 0px 2px #1890ff;
  }

  .model-menu-card-cell-list .card-detail-row > .anticon-plus {
@@ -91,5 +91,6 @@
  clear: both;
}
.menu-table-card-edit-box:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/components/chart/antv-bar/index.scss

@@ -60,5 +60,6 @@
  }
}
.menu-line-chart-edit-box:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/components/chart/antv-pie/index.scss

@@ -40,6 +40,7 @@
    }
  }
}
.menu-line-chart-edit-box:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
.menu-pie-chart-edit-box:hover {
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/components/search/main-search/index.scss

@@ -97,5 +97,6 @@
  clear: both;
}
.main-search-edit-list:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/components/table/normal-table/index.scss

@@ -60,5 +60,6 @@
  clear: both;
}
.menu-normal-table-edit-box:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/components/tabs/antv-tabs/index.scss

@@ -96,5 +96,6 @@
  }
}
.menu-tabs-edit-box:hover {
  box-shadow: 0px 0px 2px #e8e8e8;
  z-index: 1;
  box-shadow: 0px 0px 4px #1890ff;
}

 src/menu/datasource/verifycard/utils.jsx

@@ -23,21 +23,23 @@
    }

    if (setting.interType === 'system' && setting.execute !== 'false') {
      _dataresource = setting.dataresource
      _dataresource = setting.dataresource || ''
    }
    
    if (_dataresource) {
      _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
    }
    if (_customScript) {
      _customScript = _customScript.replace(/@\$|\$@/ig, '')
    }
    _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
    _customScript = _customScript.replace(/@\$|\$@/ig, '')

    if (_customScript) {
      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50) select @ErrorCode='',@retmsg =''
        ${_customScript}
      `
    }

    // 外联数据库替换
    if (window.GLOB.externalDatabase !== null) {
      _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
      _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
    }
    
    // 正则替换
    let _regoptions = []

 src/menu/modelsource/option.jsx

@@ -1,10 +1,9 @@
// import zhCN from '@/locales/zh-CN/mob.js'
// import enUS from '@/locales/en-US/mob.js'
import bar from '@/assets/mobimg/bar.png'
import bar1 from '@/assets/mobimg/bar1.png'
import line from '@/assets/mobimg/line.png'
import line1 from '@/assets/mobimg/line1.png'
import tabs from '@/assets/mobimg/tabs.png'
import group from '@/assets/mobimg/group.png'
import card1 from '@/assets/mobimg/card1.png'
import card2 from '@/assets/mobimg/card2.png'
import TableCard from '@/assets/mobimg/table-card.png'
@@ -14,11 +13,10 @@
import Pie2 from '@/assets/mobimg/nightingale.png'
import Mainsearch from '@/assets/mobimg/mainsearch.png'

// const _dict =  sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS

// 组件配置信息
export const menuOptions = [
  { type: 'menu', url: tabs, component: 'tabs', subtype: 'tabs', title: '标签页', width: 24, forbid: ['billPrint'] },
  { type: 'menu', url: group, component: 'group', subtype: 'group', title: '分组', width: 24, forbid: ['billPrint'] },
  { type: 'menu', url: Mainsearch, component: 'search', subtype: 'mainsearch', title: '搜索条件', width: 24, forbid: ['billPrint'] },
  { type: 'menu', url: card1, component: 'card', subtype: 'datacard', title: '数据卡', config: `[{"uuid":"160135809128212dm7i29fim9ksto9od","setting":{"width":6},"style":{"paddingTop":"15px","marginTop":"4px","paddingRight":"15px","marginRight":"8px","marginLeft":"8px","backgroundColor":"rgba(255, 255, 255, 1)","borderColor":"#e8e8e8","paddingLeft":"15px","marginBottom":"4px","borderWidth":"1px","paddingBottom":"10px"},"backStyle":{},"elements":[{"datatype":"static","width":12,"marks":null,"height":1,"value":"关单","style":{},"prefix":"","postfix":"","format":"","eleType":"text","uuid":"160231860159931untbea62sgokunc5s"},{"datatype":"static","width":12,"marks":null,"style":{"color":"rgba(250, 219, 20, 1)","textAlign":"right"},"btnstyle":{},"eleType":"icon","icon":"question-circle","field":"","uuid":"1602318768361nv8ql4t47sgcsn88b0u"},{"datatype":"static","width":24,"marks":null,"height":1,"innerHeight":36,"value":"100","style":{"fontSize":"24px","fontWeight":"500","color":"rgba(0, 0, 0, 1)"},"prefix":"","btnstyle":{},"postfix":"","format":"","eleType":"text","uuid":"1602318817884v70gtgb65ubnm8mbcvv"},{"color":"#1890ff","width":24,"marks":null,"maxValue":100,"style":{"color":"rgba(250, 140, 22, 1)","paddingTop":"20px","paddingBottom":"10px"},"btnstyle":{},"eleType":"slider","field":"int1","uuid":"16023188871233rkktuvpp1h077igrsu"},{"eleType":"splitline","width":24,"color":"#e8e8e8","uuid":"1602320017038n31bk9o831ggug0tu0b","marks":null,"style":{"marginTop":"10px","marginBottom":"10px"},"btnstyle":{}},{"datatype":"static","width":12,"marks":null,"height":1,"value":"100","style":{"marginTop":"6px"},"prefix":"关单","btnstyle":{},"postfix":"","format":"","eleType":"text","uuid":"1602320061243drd7lf3agvn04kgr175"}],"backElements":[]}]` },
  { type: 'menu', url: card2, component: 'card', subtype: 'propcard', title: '属性卡', config: `[{"uuid":"1603681387259qaqf1127f72esmtchge","setting":{"width":6,"type":"simple"},"style":{"paddingTop":"15px","marginTop":"8px","paddingRight":"15px","marginRight":"8px","marginLeft":"8px","borderColor":"#e8e8e8","paddingLeft":"15px","marginBottom":"8px","borderWidth":"1px","paddingBottom":"15px"},"backStyle":{},"elements":[{"datatype":"static","width":12,"marks":null,"height":1,"value":"超时工单","style":{"color":"rgba(67, 67, 67, 0.51)"},"prefix":"","postfix":"","format":"","eleType":"text","uuid":"1603681402945qnkgm7q8cng65evn5ev"},{"eleType":"icon","datatype":"static","width":12,"icon":"question-circle","tooltip":"超时工单","uuid":"1603681473384i2crkbtofg4pu76k06a","marks":null,"style":{"textAlign":"right","color":"rgba(250, 219, 20, 1)"}},{"datatype":"static","width":24,"marks":null,"height":1,"innerHeight":36,"value":"100","style":{"fontSize":"24px","color":"rgba(0, 0, 0, 1)"},"prefix":"","postfix":"","format":"","eleType":"number","uuid":"1603681539870d704ufqf98kc6t7537t"},{"color":"rgba(250, 219, 20, 1)","datatype":"static","width":24,"marks":null,"maxValue":100,"value":50,"style":{"paddingTop":"10px","paddingBottom":"10px"},"eleType":"slider","uuid":"1603683067556mvupau0odvrtv45u7o8"},{"eleType":"splitline","width":24,"color":"#e8e8e8","uuid":"1603683117981t9k55k8an430fuppmci","marks":null,"style":{"paddingTop":"5px","paddingBottom":"5px"}},{"datatype":"static","width":12,"marks":null,"height":1,"value":"100","style":{"color":"rgba(0, 0, 0, 0.65)","marginTop":"10px"},"prefix":"超时工单  ","postfix":"","format":"","eleType":"text","uuid":"1603683136553uvsmkfohkft9idbfkhu"}],"backElements":[]}]` },

 src/tabviews/custom/components/card/data-card/index.jsx

@@ -373,7 +373,7 @@
            ))}
          </div> : null}
          {switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
          {data && data.length === 0 ? <Empty description={false}/> : null}
          {!data || data.length === 0 ? <Empty description={false}/> : null}
        </div>
        {config.wrap.pagestyle !== 'switch' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={t => `共 ${t} 条`} pageSize={config.setting.pageSize} onChange={this.changePageIndex} current={pageIndex}/> : null}
      </div>

 src/tabviews/custom/components/card/data-card/index.scss

@@ -3,7 +3,7 @@
  background-position: center center;
  background-repeat: no-repeat;
  background-size: cover;
  min-height: 100px;
  min-height: 20px;

  >.button-list.toolbar-button {
    padding: 0;

 src/tabviews/custom/components/card/prop-card/index.scss

@@ -3,7 +3,7 @@
  background-position: center center;
  background-repeat: no-repeat;
  background-size: cover;
  min-height: 100px;
  min-height: 20px;
  position: relative;

  .card-row-list::after {

 src/tabviews/zshare/actionList/normalbutton/index.jsx

@@ -943,7 +943,7 @@
                  }
                  // 外联数据库替换
                  if (window.GLOB.externalDatabase !== null) {
                    _option.sql = _option.sql.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
                    _option.sql = _option.sql.replace(/@db@/ig, window.GLOB.externalDatabase)
                  }

                  cell.data_sql = Utils.formatOptions(_option.sql)

 src/tabviews/zshare/actionList/printbutton/index.jsx

@@ -1069,7 +1069,7 @@
                  }
                  // 外联数据库替换
                  if (window.GLOB.externalDatabase !== null) {
                    _option.sql = _option.sql.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
                    _option.sql = _option.sql.replace(/@db@/ig, window.GLOB.externalDatabase)
                  }

                  cell.data_sql = Utils.formatOptions(_option.sql)

 src/tabviews/zshare/topSearch/index.jsx

@@ -112,7 +112,7 @@
          } else { // 合并请求，区分本地及系统
            // 外联数据库替换
            if (window.GLOB.externalDatabase !== null) {
              _option.sql = _option.sql.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
              _option.sql = _option.sql.replace(/@db@/ig, window.GLOB.externalDatabase)
            }
            if (item.database === 'sso') {
              mainItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql))}' as LText`)

 src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx

@@ -139,6 +139,11 @@

        param.LText = param.LText.replace(/@\$|\$@/ig, '')

        // 外联数据库替换
        if (window.GLOB.externalDatabase !== null) {
          param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
        }

        param.LText = Utils.formatOptions(param.LText)
        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
        param.secretkey = Utils.encrypt(param.LText, param.timestamp)

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

@@ -38,6 +38,12 @@
      _customScript = _customScript.replace(/@\$|\$@/ig, '')
    }
    
    // 外联数据库替换
    if (window.GLOB.externalDatabase !== null) {
      _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
      _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
    }
    
    // 正则替换
    let _regoptions = []
    let _search = ''

 src/templates/sharecomponent/settingcomponent/settingform/utils.jsx

@@ -9,7 +9,7 @@
   */
  static getDebugSql (setting, scripts, arr_field, regoptions, search) {
    let sql = ''
    let _dataresource = setting.dataresource
    let _dataresource = setting.dataresource || ''
    let _customScript = ''
    scripts && scripts.forEach(script => {
      _customScript += `
@@ -33,6 +33,11 @@
    if (_customScript) {
      _customScript = _customScript.replace(/@\$|\$@/ig, '')
    }
    // 外联数据库替换
    if (window.GLOB.externalDatabase !== null) {
      _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
      _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
    }
    
    // 正则替换
    let _regoptions = regoptions.map(item => {

 src/templates/sharecomponent/treesettingcomponent/settingform/utils.jsx

@@ -29,6 +29,12 @@
    
    _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
    _customScript = _customScript.replace(/@\$|\$@/ig, '')

    // 外联数据库替换
    if (window.GLOB.externalDatabase !== null) {
      _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
      _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
    }
    
    // 正则替换
    let _regoptions = [

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

@@ -103,6 +103,11 @@
        // 数据权限
        param.LText = param.LText.replace(/@\$|\$@/ig, '')

        // 外联数据库替换
        if (window.GLOB.externalDatabase !== null) {
          param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
        }

        param.LText = Utils.formatOptions(param.LText)
        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
        param.secretkey = Utils.encrypt(param.LText, param.timestamp)

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

@@ -106,6 +106,11 @@
        // 数据权限
        param.LText = param.LText.replace(/@\$|\$@/ig, '')

        // 外联数据库替换
        if (window.GLOB.externalDatabase !== null) {
          param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
        }

        console.info(`/* sql 验证 */\n${param.LText.replace(/\n\s{6,20}/ig, '\n')}`)

        param.LText = Utils.formatOptions(param.LText)

 src/utils/utils.js

@@ -168,7 +168,7 @@
    value = value.replace(/%/ig, ' mpercent ')
    // 外联数据库替换
    if (window.GLOB.externalDatabase !== null) {
      value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
      value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
    }
    // encode编码（中文字符超出base64加密范围）
    value = window.btoa(window.encodeURIComponent(value))
@@ -239,7 +239,7 @@
    value = value.replace(/%/ig, ' mpercent ')
    // 外联数据库替换
    if (window.GLOB.externalDatabase !== null) {
      value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
      value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
    }

    let encodesql = (val) => {

 src/views/menudesign/index.scss

@@ -8,8 +8,15 @@
    position: relative;
    background: #ffffff;
    padding: 50px 0px 0px 0px;

    
    // .menu-setting::before {
    //   content: ' ';
    //   position: absolute;
    //   width: 300px;
    //   height: 100%;
    //   left: 0;
    //   top: 0;
    // }
    .menu-setting {
      position: fixed;
      left: 0;