2021-07-09

king

2021-07-09 c1844ae65c6ac4704d8a59e18510ed5c676de697

2021-07-09

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

@@ -35,7 +35,7 @@
  state = {
    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
    card: null,
    ismob: sessionStorage.getItem('appType') === 'mob',
    appType: sessionStorage.getItem('appType'),
    eventListener: null
  }

@@ -1248,15 +1248,15 @@
  }

  render() {
    const { card, ismob } = this.state
    const { card, appType } = this.state
    let _style = resetStyle(card.style)

    return (
      <div className="menu-line-chart-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
        <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
          <div className="mk-popover-control">
            {!ismob ? <Icon className="plus" title="添加搜索" onClick={this.addSearch} type="plus-circle" /> : null}
            <Icon className="plus" title="添加按钮" onClick={this.addButton} type="plus-square" />
            {appType !== 'mob' ? <Icon className="plus" title="添加搜索" onClick={this.addSearch} type="plus-circle" /> : null}
            {appType !== 'mob' ? <Icon className="plus" title="添加按钮" onClick={this.addButton} type="plus-square" /> : null}
            <ChartCompileForm config={card} dict={this.state.dict} plotchange={this.updateComponent}/>
            <CopyComponent type="line" card={card}/>
            <PasteComponent config={card} options={['action', 'search', 'form']} updateConfig={this.updateComponent} />
@@ -1272,11 +1272,11 @@
        </Popover>
        {card.plot.title || card.search.length > 0 ? <NormalHeader config={card} updateComponent={this.updateComponent}/> : null}
        <div className="canvas" id={card.uuid + 'canvas'}></div>
        <ActionComponent
        {appType !== 'mob' ? <ActionComponent
          type="chart"
          config={card}
          updateaction={this.updateComponent}
        />
        /> : null}
      </div>
    )
  }

 src/menu/components/chart/antv-scatter/index.jsx

@@ -33,7 +33,7 @@
  state = {
    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
    card: null,
    ismob: sessionStorage.getItem('appType') === 'mob',
    appType: sessionStorage.getItem('appType'),
    eventListener: null
  }

@@ -371,15 +371,15 @@
  }

  render() {
    const { card, ismob } = this.state
    const { card, appType } = this.state
    let _style = resetStyle(card.style)

    return (
      <div className="menu-scatter-chart-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
        <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
          <div className="mk-popover-control">
            {!ismob ? <Icon className="plus" title="添加搜索" onClick={this.addSearch} type="plus-circle"/> : null}
            <Icon className="plus" title="添加按钮" onClick={this.addButton} type="plus-square" />
            {appType !== 'mob' ? <Icon className="plus" title="添加搜索" onClick={this.addSearch} type="plus-circle"/> : null}
            {appType !== 'mob' ? <Icon className="plus" title="添加按钮" onClick={this.addButton} type="plus-square" /> : null}
            <ChartCompileForm config={card} dict={this.state.dict} plotchange={this.updateComponent}/>
            <CopyComponent type="line" card={card}/>
            <PasteComponent config={card} options={['action', 'search', 'form']} updateConfig={this.updateComponent}/>
@@ -395,7 +395,7 @@
        </Popover>
        {card.plot.title || card.search.length > 0 ? <NormalHeader config={card} updateComponent={this.updateComponent}/> : null}
        <div className="canvas" id={card.uuid + 'canvas'}></div>
        <ActionComponent type="chart" config={card} updateaction={this.updateComponent}/>
        {appType !== 'mob' ? <ActionComponent type="chart" config={card} updateaction={this.updateComponent}/> : null}
      </div>
    )
  }

 src/menu/components/share/actioncomponent/formconfig.jsx

@@ -60,7 +60,6 @@
  ]
  
  if (isApp) {
    opentypes = opentypes.filter(item => item.value !== 'tab')
    pageTemps = [
      // { value: 'page', text: '菜单' },
      { value: 'linkpage', text: '关联菜单' },
@@ -82,9 +81,15 @@
    } else {
      appMenus = []
    }

    if (appType === 'mob') {
      opentypes = opentypes.filter(item => ['pop', 'prompt', 'exec', 'innerpage'].includes(item.value))
    } else {
      opentypes = opentypes.filter(item => item.value !== 'tab')
    }
  }
  
  if (type === 'chart') {
  if (type === 'chart' && appType !== 'mob') {
    opentypes = opentypes.filter(item => item.value === 'excelIn' || item.value === 'excelOut')
  }

@@ -110,7 +115,7 @@
      type: 'radio',
      key: 'funcType',
      label: Formdict['header.form.funcType'],
      initVal: card.funcType || (isApp ? 'changeuser' : ''),
      initVal: card.funcType || '',
      required: true,
      options: funTypes
    },

 src/mob/searchconfig/index.jsx

@@ -280,7 +280,7 @@
    notification.success({
      top: 92,
      message: '保存成功。',
      duration: 2
      duration: 1
    })
  }


 src/tabviews/zshare/mutilform/checkCard/index.scss

@@ -24,7 +24,7 @@
      left: 0;
      right: 0;
      bottom: 0;
      opacity: 0.5;
      opacity: 0.3;
      border-radius: 4px;
      background-color: transparent;
      transition: opacity 0.3s;

 src/templates/modalconfig/checkCard/index.scss

@@ -20,7 +20,7 @@
      left: 0;
      right: 0;
      bottom: 0;
      opacity: 0.5;
      opacity: 1;
      border-radius: 4px;
      background-color: transparent;
    }

 src/utils/utils.js

@@ -840,7 +840,7 @@
          val = val.toString()
        }

        val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
        val = val.replace(/(^\s*$)|\t*|\v*|'*/ig, '')

        if (!val && col.required === 'true') {            // 必填校验
          errors.push(_position + dict['main.excel.content.emptyerror'])

 src/views/appmanage/submutilform/index.jsx

@@ -174,34 +174,20 @@
                initialValue: card ? card.css : 'bg_black_style_blue'
              })(
                <Select>
                  <Select.Option value="bg_black_style_blue">蓝黑色系</Select.Option>
                  <Select.Option value="bg_white_style_blue">蓝白色系</Select.Option>
                  <Select.Option value="bg_black_style_red">红黑色系</Select.Option>
                  <Select.Option value="bg_white_style_red">红白色系</Select.Option>
                  <Select.Option value="bg_black_style_orange_red">橙红黑色系</Select.Option>
                  <Select.Option value="bg_white_style_orange_red">橙红白色系</Select.Option>
                  <Select.Option value="bg_black_style_orange">橙黑色系</Select.Option>
                  <Select.Option value="bg_white_style_orange">橙白色系</Select.Option>
                  <Select.Option value="bg_black_style_orange_yellow">橙黄黑色系</Select.Option>
                  <Select.Option value="bg_white_style_orange_yellow">橙黄白色系</Select.Option>
                  <Select.Option value="bg_black_style_yellow">黄黑色系</Select.Option>
                  <Select.Option value="bg_white_style_yellow">黄白色系</Select.Option>
                  <Select.Option value="bg_black_style_yellow_green">黄绿黑色系</Select.Option>
                  <Select.Option value="bg_white_style_yellow_green">黄绿白色系</Select.Option>
                  <Select.Option value="bg_black_style_green">绿黑色系</Select.Option>
                  <Select.Option value="bg_white_style_green">绿白色系</Select.Option>
                  <Select.Option value="bg_black_style_cyan">青黑色系</Select.Option>
                  <Select.Option value="bg_white_style_cyan">青白色系</Select.Option>
                  <Select.Option value="bg_black_style_blue_purple">蓝紫黑色系</Select.Option>
                  <Select.Option value="bg_white_style_blue_purple">蓝紫白色系</Select.Option>
                  <Select.Option value="bg_black_style_purple">紫黑色系</Select.Option>
                  <Select.Option value="bg_white_style_purple">紫白色系</Select.Option>
                  <Select.Option value="bg_black_style_magenta">洋红黑色系</Select.Option>
                  <Select.Option value="bg_white_style_magenta">洋红白色系</Select.Option>
                  <Select.Option value="bg_black_style_grass_green">草绿黑色系</Select.Option>
                  <Select.Option value="bg_white_style_grass_green">草绿白色系</Select.Option>
                  <Select.Option value="bg_black_style_deep_red">深红黑色系</Select.Option>
                  <Select.Option value="bg_white_style_deep_red">深红白色系</Select.Option>
                  <Select.Option value="bg_black_style_blue">蓝系</Select.Option>
                  <Select.Option value="bg_black_style_red">红系</Select.Option>
                  <Select.Option value="bg_black_style_orange_red">橙红系</Select.Option>
                  <Select.Option value="bg_black_style_orange">橙系</Select.Option>
                  <Select.Option value="bg_black_style_orange_yellow">橙黄系</Select.Option>
                  <Select.Option value="bg_black_style_yellow">黄系</Select.Option>
                  <Select.Option value="bg_black_style_yellow_green">黄绿系</Select.Option>
                  <Select.Option value="bg_black_style_green">绿系</Select.Option>
                  <Select.Option value="bg_black_style_cyan">青系</Select.Option>
                  <Select.Option value="bg_black_style_blue_purple">蓝紫系</Select.Option>
                  <Select.Option value="bg_black_style_purple">紫系</Select.Option>
                  <Select.Option value="bg_black_style_magenta">洋红系</Select.Option>
                  <Select.Option value="bg_black_style_grass_green">草绿系</Select.Option>
                  <Select.Option value="bg_black_style_deep_red">深红系</Select.Option>
                </Select>
              )}
            </Form.Item>