Merge branch 'master' into positec

king

2025-03-07 861192573a5fa59529d542201c210066f0ed3ca4

 src/views/appmanage/submutilform/index.jsx

@@ -126,7 +126,7 @@
  }

  render() {
    const { card, type } = this.props
    const { card, type, selectApp } = this.props
    const { getFieldDecorator } = this.props.form
    const { typename, adapters, exts, langs, WXApps, WXMerchs } = this.state
    const formItemLayout = {
@@ -201,6 +201,27 @@
                  <Select.Option value="bg_black_style_deep_red"><span className="color-block" style={{background: '#c32539'}}></span>深红色（#c32539）</Select.Option>
                  <Select.Option value="bg_black_style_deep_blue"><span className="color-block" style={{background: '#1d3661'}}></span>深蓝色（#1d3661）</Select.Option>
                </Select>
              )}
            </Form.Item>
          </Col>
          <Col span={12}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="当前子应用的名称。">
                <QuestionCircleOutlined className="mk-form-tip" />
                应用名称
              </Tooltip>
            }>
              {getFieldDecorator('app_name', {
                initialValue: card ? card.app_name || selectApp.remark || '' : selectApp.remark || '',
              })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
            </Form.Item>
          </Col>
          <Col span={12}>
            <Form.Item label="LOGO">
              {getFieldDecorator('app_icon', {
                initialValue: card ? card.app_icon : ''
              })(
                <SourceComponent type="picture" placement="right"/>
              )}
            </Form.Item>
          </Col>
@@ -281,11 +302,10 @@
          </Col> : null} */}
          <Col span={12}>
            <Form.Item label={
              exts.includes('share') ?
              <Tooltip placement="topLeft" title="子应用及分享时的标题。">
              <Tooltip placement="topLeft" title={`子应用${exts.includes('share') ? '及分享时' : ''}的标题。`}>
                <QuestionCircleOutlined className="mk-form-tip" />
                标题
              </Tooltip> : '标题'
              </Tooltip>
            }>
              {getFieldDecorator('title', {
                initialValue: card ? card.title || '' : '',
@@ -360,6 +380,23 @@
              )}
            </Form.Item>
          </Col> : null}
          <Col span={12}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="是否允许在其他应用中打开。">
                <QuestionCircleOutlined className="mk-form-tip" />
                订阅
              </Tooltip>
            }>
              {getFieldDecorator('allow_subscribe', {
                initialValue: card ? card.allow_subscribe || '' : ''
              })(
                <Radio.Group>
                  <Radio value="">关闭</Radio>
                  <Radio value="Y">开启</Radio>
                </Radio.Group>
              )}
            </Form.Item>
          </Col>
          {typename !== 'pc' ? <Col span={12}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="在使用小程序或明科云APP时（app模式中）无效">