Merge branch 'master' into positec

king

2025-03-05 c56dd9479e4c44af4b58c5a14c6f0f3f3cc20d85

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

@@ -116,9 +116,20 @@
  }

  getWrapForms = () => {
    const { setting } = this.state.group
    const { group } = this.state

    return getSettingForm(setting)
    let list = []
    group.components.forEach(item => {
      if (item.type === 'card' && item.subtype === 'propcard') {
        list.push({
          value: item.uuid,
          label: item.name,
          disabled: item.wrap.empty !== 'hidden'
        })
      }
    })

    return getSettingForm(group.setting, list)
  }

  updateWrap = (res) => {
@@ -175,7 +186,7 @@
        <NormalHeader hideSearch="true" config={group} updateComponent={this.updateComponent}/>
        <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
          <div className="mk-popover-control">
            <NormalForm title="分组设置" width={700} update={this.updateWrap} getForms={this.getWrapForms}>
            <NormalForm title="分组设置" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
              <EditOutlined style={{color: '#1890ff'}} title="编辑"/>
            </NormalForm>
            <CopyComponent type="group" card={group}/>