2021-05-26

king

2021-05-26 ed5aac57295156ef6767df4b4cd998f866565d88

2021-05-26

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

@@ -378,12 +378,17 @@

  addCard = () => {
    let card = fromJS(this.state.card).toJS()
    let height = card.subcards[0].style.height
    if (height === 'auto') {
      height = '100px'
    }

    let newcard = {
      uuid: Utils.getuuid(),
      $cardType: 'extendCard',
      setting: { width: 6, type: 'simple', click: 'button'},
      style: {
        height,
        borderWidth: '1px', borderColor: '#e8e8e8',
        paddingTop: '15px', paddingBottom: '15px', paddingLeft: '15px', paddingRight: '15px',
        marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px'

 src/menu/components/form/normal-form/index.jsx

@@ -364,7 +364,7 @@
    })
  }

  handleList = (list) => {
  handleList = (list, newcard) => {
    let group = fromJS(this.state.group).toJS()
    let card = fromJS(this.state.card).toJS()

@@ -377,7 +377,11 @@
      return item
    })

    this.setState({card, group})
    this.setState({card, group}, () => {
      if (newcard) {
        this.handleForm(newcard)
      }
    })
    this.props.updateConfig(card)
  }


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

@@ -541,6 +541,7 @@
          return null
        }
      }
      let _data = data.$$type === 'extendCard' ? [] : [data]

      if (['exec', 'prompt', 'pop'].includes(card.OpenType)) {
        return (
@@ -552,7 +553,7 @@
              style={card.style}
              setting={cards.setting}
              columns={cards.columns}
              selectedData={[data]}
              selectedData={_data}
            />
          </Col>
        )
@@ -565,7 +566,7 @@
              show={card.show}
              style={card.style}
              setting={cards.setting}
              selectedData={[data]}
              selectedData={_data}
            />
          </Col>
        )
@@ -590,7 +591,7 @@
              show={card.show}
              style={card.style}
              setting={cards.setting}
              selectedData={[data]}
              selectedData={_data}
            />
          </Col>
        )
@@ -602,7 +603,7 @@
              show={card.show}
              style={card.style}
              setting={cards.setting}
              selectedData={[data]}
              selectedData={_data}
            />
          </Col>
        )
@@ -614,7 +615,7 @@
              show={card.show}
              style={card.style}
              setting={cards.setting}
              selectedData={[data]}
              selectedData={_data}
            />
          </Col>
        )
@@ -628,7 +629,7 @@
                show={card.show}
                style={card.style}
                setting={cards.setting}
                selectedData={[data]}
                selectedData={_data}
              />
            </Col>
          )
@@ -641,7 +642,7 @@
                show={card.show}
                style={card.style}
                setting={cards.setting}
                selectedData={[data]}
                selectedData={_data}
              />
            </Col>
          )

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

@@ -601,7 +601,7 @@
            ))}
            {config.subcards.map((item, index) => (
              <Col key={'mk' + index} className={item.setting.$click} span={item.setting.width || 6} offset={(!data || data.length === 0) ? offset : 0}>
                <CardItem card={item} cards={config} data={{$$BID: BID}}/>
                <CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
              </Col>
            ))}
          </Row>