Merge branch 'develop'

king

2022-08-02 8d66ff34fae5b048a6b7923cc75d34f13a08be9d

 src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx

@@ -168,6 +168,23 @@
              )}
            </Form.Item>
          </Col>
          {property === 'menu' || property === 'linkmenu' ? <Col span={12}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="替换当前页面或打开新页面，在H5或小程序中有效。">
                <QuestionCircleOutlined className="mk-form-tip" />
                打开方式
              </Tooltip>
            }>
              {getFieldDecorator('open', {
                initialValue: menu.open || 'self'
              })(
                <Radio.Group>
                  <Radio value="self">标签页</Radio>
                  <Radio value="blank">新页面</Radio>
                </Radio.Group>
              )}
            </Form.Item>
          </Col> : null}
          {property === 'link' ? <Col span={24}>
            <Form.Item label="链接地址" className="textarea">
              {getFieldDecorator('link', {
@@ -193,10 +210,14 @@
                  message: '请选择关联菜单!'
                }]
              })(
                <Select>
                  {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
                <Select
                  showSearch
                  filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
                    option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
                >
                  {appMenus.map(item => (<Select.Option key={item.MenuID} extend={item.MenuNo || ''} value={item.MenuID}>{item.MenuName}</Select.Option>))}
                  {/* <Select.Option key="IM" value="IM">即时通信（系统页）</Select.Option> */}
                  <Select.Option key="AIService" value="AIService">智能客服（系统页）</Select.Option>
                  <Select.Option key="AIService" extend={''} value="AIService">智能客服（系统页）</Select.Option>
                </Select>
              )}
            </Form.Item>
@@ -211,8 +232,14 @@
              {getFieldDecorator('copyMenuId', {
                initialValue: menu.copyMenuId || ''
              })(
                <Select allowClear onChange={(val) => this.setState({copyMenu: val})}>
                  {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
                <Select
                  allowClear
                  showSearch
                  filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
                    option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
                  onChange={(val) => this.setState({copyMenu: val})}
                >
                  {appMenus.map(item => (<Select.Option key={item.MenuID} extend={item.MenuNo || ''} value={item.MenuID}>{item.MenuName}</Select.Option>))}
                </Select>
              )}
            </Form.Item>
@@ -234,6 +261,23 @@
              )}
            </Form.Item>
          </Col> : null}
          <Col span={12}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="在H5或小程序中有效。">
                <QuestionCircleOutlined className="mk-form-tip" />
                菜单样式
              </Tooltip>
            }>
              {getFieldDecorator('class', {
                initialValue: menu.class || 'default'
              })(
                <Radio.Group>
                  <Radio value="default">默认</Radio>
                  <Radio value="zoomIn">放大</Radio>
                </Radio.Group>
              )}
            </Form.Item>
          </Col>
        </Row>
      </Form>
    )