2023-07-29

king

2023-07-29 84921b459e113717734a20534f4266863727f89c

2023-07-29

 src/tabviews/custom/index.jsx

@@ -1525,7 +1525,7 @@
    const { loadingview, viewlost, config, loading, shortcuts, BID } = this.state

    return (
      <div className={`custom-page-wrap ${config && config.minWidth ? 'mk-scroll' : ''} ${loadingview || loading ? 'loading' : ''}`} id={this.state.ContainerId} style={config ? config.style : null}>
      <div className={`custom-page-wrap ${config && config.minWidth ? 'mk-scroll' : ''} ${loadingview || loading ? 'loading' : ''} ${config && config.mask === 'false' ? 'mk-no-mask' : ''}`} id={this.state.ContainerId} style={config ? config.style : null}>
        {(loadingview || (loading && !config.$cache)) ? <Spin className="view-spin" size="large" /> : null}
        <Row id={config ? 'menu' + config.uuid : ''} style={config && config.minWidth ? {minWidth: config.minWidth} : null} className="component-wrap">{this.getComponents()}</Row>
        {config && config.interfaces.length > 0 ? <MkInterfaces BID={BID} interfaces={config.interfaces}/> : null}

 src/tabviews/custom/index.scss

@@ -49,6 +49,15 @@
    display: none;
  }
}
.custom-page-wrap.mk-no-mask {
  .ant-spin-blur {
    background: transparent!important;
    opacity: 1;
  }
  .ant-spin-blur::after {
    opacity: 0;
  }
}
.custom-page-wrap.mk-scroll {
  height: calc(100vh - 93px);
  overflow: auto;

 src/views/menudesign/homeform/index.jsx

@@ -201,6 +201,23 @@
              )}
            </Form.Item>
          </Col> : null}
          <Col span={24}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="数据加载时的遮罩是否显示。">
                <QuestionCircleOutlined className="mk-form-tip" />
                加载遮罩
              </Tooltip>
            }>
              {getFieldDecorator('mask', {
                initialValue: config.mask || 'true'
              })(
                <Radio.Group onChange={(e) => {this.selectChange('mask', e.target.value)}}>
                  <Radio value="true">显示</Radio>
                  <Radio value="false">隐藏</Radio>
                </Radio.Group>
              )}
            </Form.Item>
          </Col>
        </Row>
      </Form>
    )

 src/views/menudesign/menuform/index.jsx

@@ -398,6 +398,23 @@
          </Col> : null}
          <Col span={24}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="数据加载时的遮罩是否显示。">
                <QuestionCircleOutlined className="mk-form-tip" />
                加载遮罩
              </Tooltip>
            }>
              {getFieldDecorator('mask', {
                initialValue: config.mask || 'true'
              })(
                <Radio.Group onChange={(e) => {this.selectChange('mask', e.target.value)}}>
                  <Radio value="true">显示</Radio>
                  <Radio value="false">隐藏</Radio>
                </Radio.Group>
              )}
            </Form.Item>
          </Col>
          <Col span={24}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="如果页面内容在窗口中无法完全展示，可设置最小宽度，实现页面的横向滚动。">
                <QuestionCircleOutlined className="mk-form-tip" />
                最小宽度

 src/views/pcdesign/menuform/index.jsx

@@ -155,9 +155,9 @@
          </Col>
          <Col span={24}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="数据加载时的遮罩和空数据图标是否显示。">
              <Tooltip placement="topLeft" title="数据加载时的遮罩是否显示。">
                <QuestionCircleOutlined className="mk-form-tip" />
                数据提示
                加载遮罩
              </Tooltip>
            }>
              {getFieldDecorator('mask', {