king
2024-06-03 27d6ff04382d95f360e4dc18769a9bd36dfca4b4
2024-06-03
10个文件已修改
87 ■■■■■ 已修改文件
src/menu/components/search/main-search/index.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/menu/components/search/main-search/index.scss 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/menu/components/search/main-search/options.jsx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/menu/components/table/base-table/options.jsx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/menu/components/table/edit-table/options.jsx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/menu/components/table/normal-table/options.jsx 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/tabviews/zshare/topSearch/index.jsx 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/tabviews/zshare/topSearch/index.scss 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/templates/sharecomponent/searchcomponent/index.jsx 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/templates/sharecomponent/searchcomponent/index.scss 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/menu/components/search/main-search/index.jsx
@@ -381,7 +381,7 @@
    let _style = resetStyle(card.style)
    return (
      <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
      <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''} mk-size-${card.wrap.searchSize || ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
        <FieldsComponent config={card} type="search" />
        <Switch checkedChildren="开" size="small" unCheckedChildren="关" defaultChecked={showField} onChange={this.onFieldChange} />
        <DragElement
src/menu/components/search/main-search/index.scss
@@ -153,6 +153,17 @@
  }
}
.main-search-edit-list.mk-size-small {
  .page-card {
    height: 45px;
  }
  .mk-search-item-wrap.action {
    .ant-form-item {
      height: 45px!important;
    }
  }
}
.main-search-edit-list:not(.show-field) {
  .ant-form-explain {
    display: none;
src/menu/components/search/main-search/options.jsx
@@ -160,6 +160,18 @@
    },
    {
      type: 'radio',
      field: 'searchSize',
      label: '搜索间距',
      initval: wrap.searchSize || 'middle',
      tooltip: '搜索条件的上下间距。',
      required: false,
      options: [
        {value: 'middle', label: '默认'},
        {value: 'small', label: '小'},
      ],
    },
    {
      type: 'radio',
      field: 'cacheSearch',
      label: '搜索缓存',
      initval: wrap.cacheSearch || 'false',
src/menu/components/table/base-table/options.jsx
@@ -76,6 +76,18 @@
        {value: 'mini', label: '迷你'},
      ]
    },
    {
      type: 'radio',
      field: 'searchSize',
      label: '搜索间距',
      initval: wrap.searchSize || 'middle',
      tooltip: '搜索条件的上下间距。',
      required: false,
      options: [
        {value: 'middle', label: '默认'},
        {value: 'small', label: '小'},
      ],
    },
    // {
    //   type: 'radio',
    //   field: 'selected',
src/menu/components/table/edit-table/options.jsx
@@ -130,6 +130,18 @@
    },
    {
      type: 'radio',
      field: 'searchSize',
      label: '搜索间距',
      initval: wrap.searchSize || 'middle',
      tooltip: '搜索条件的上下间距。',
      required: false,
      options: [
        {value: 'middle', label: '默认'},
        {value: 'small', label: '小'},
      ],
    },
    {
      type: 'radio',
      field: 'parity',
      label: '奇偶异色',
      initval: wrap.parity || 'false',
src/menu/components/table/normal-table/options.jsx
@@ -161,6 +161,19 @@
    },
    {
      type: 'radio',
      field: 'searchSize',
      label: '搜索间距',
      initval: wrap.searchSize || 'middle',
      tooltip: '搜索条件的上下间距。',
      required: false,
      options: [
        {value: 'middle', label: '默认'},
        {value: 'small', label: '小'},
      ],
      forbid: appType === 'mob'
    },
    {
      type: 'radio',
      field: 'mode',
      label: '模式',
      initval: wrap.mode || 'default',
src/tabviews/zshare/topSearch/index.jsx
@@ -67,6 +67,7 @@
      _setting.wrapperCol = {style: {width: (100 - _setting.labelwidth) + '%'}}
      _setting.borderRadius = config.wrap.borderRadius
      _setting.resetContrl = config.wrap.resetContrl || 'init'
      _setting.size = config.wrap.searchSize || ''
      if (config.wrap.searchBtn === 'show') {
        _setting.showBtn = true
@@ -1124,7 +1125,7 @@
    return (
      <>
        <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float}`} style={setting.style}>
        <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float} mk-size-${setting.size}`} style={setting.style}>
          <Row gutter={24}>{this.getFields()}</Row>
          {advanceValues.length && (setting.advanceType !== 'pulldown' || (setting.advanceType === 'pulldown' && !visible)) ? <Row gutter={24}>
            <div className="advanced-list">
src/tabviews/zshare/topSearch/index.scss
@@ -132,6 +132,11 @@
    text-align: right;
  }
}
.mk-search-wrap.mk-size-small {
  .ant-form-item, .search-button {
    min-height: 45px;
  }
}
.mk-search-drawer {
  .ant-drawer-wrapper-body {
    position: relative;
src/templates/sharecomponent/searchcomponent/index.jsx
@@ -330,8 +330,13 @@
    const { config } = this.props
    const { searchlist, visible, sqlVerifing, card, showField, setVisible } = this.state
    let size = ''
    if (config.wrap && config.wrap.searchSize) {
      size = ' mk-size-' + config.wrap.searchSize
    }
    return (
      <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '')}>
      <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '') + size}>
        <FieldsComponent config={{uuid: config.uuid, search: searchlist}} type="search" />
        <Switch className="switch-field-show" checkedChildren="开" unCheckedChildren="关" defaultChecked={showField} onChange={this.onFieldChange} />
        <DragElement
src/templates/sharecomponent/searchcomponent/index.scss
@@ -142,3 +142,13 @@
    }
  }
}
.model-table-search-list.mk-size-small {
  .page-card {
    height: 45px;
  }
  .mk-search-item-wrap.action {
    .ant-form-item {
      height: 45px!important;
    }
  }
}