Merge branch 'develop'

king

2022-11-21 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc

 src/menu/stylecombcontroller/styleInput/index.jsx

@@ -140,7 +140,7 @@
      <div className="style-input-box">
        <Input value={value} addonAfter={
          options.length > 1 ?
          <Select value={unit} onChange={this.changeUnit}>
          <Select value={<span>{unit}</span>} onChange={this.changeUnit}>
            {options.map(item => <Option key={item} value={item}>{item}</Option>)}
          </Select> :
          <div className="single-unit">{unit}</div>