cnhis-design-vue 0.2.42-beta → 0.2.45-beta

package/packages/table-filter/src/components/search-condition/SearchCondition.vue

@@ -630,6 +630,7 @@ export default create({
           ageValue: ageValue || {},
 
           converFun: item.converFun || undefined,
+          parameterConversionId: item.parameterConversionId || undefined,
           relationOrgId: item.relationOrgId || undefined,
           preConObj: item.preConObj || undefined,
           preSqlExpression: item.preSqlExpression || undefined,
@@ -789,6 +790,7 @@ export default create({
           valueField: item.relationField || undefined, // 关联字段
           quote_con: Object.keys(item.quote_con || {}).length ? item.quote_con : null, // 关联表格过滤项
           converFun: item.converFun || undefined,
+          parameterConversionId: item.parameterConversionId || undefined,
           relationOrgId: item.relationOrgId || undefined,
           preConObj: item.preConObj || undefined,
           preSqlExpression: item.preSqlExpression || undefined,
@@ -1332,6 +1334,7 @@ export default create({
       curItem && (item.relationField = curItem.relationField);
       item.relationFieldList = JSON.parse(JSON.stringify(curItem?.fieldList?.fieldList || []));
       item.converFun = curItem.converFun || undefined;
+      item.parameterConversionId = curItem.parameterConversionId || undefined;
       item.relationOrgId = curItem.relationOrgId || undefined;
       item.preConObj = curItem.preConObj || undefined;
       item.preSqlExpression = curItem.preSqlExpression || undefined;

package/src/component/select-pages/index.vue

@@ -9,7 +9,7 @@
       <a-icon type="left" /> 上一页
     </a-button>
     <a-button
-      :disabled="!props.searchPageConfig.hasNextPage"
+      :disabled="props.searchPageConfig.total ? props.searchPageConfig.page >= props.searchPageConfig.total : !props.searchPageConfig.hasNextPage"
       type="dashed"
       block
       @click.self.stop="props.handleSearchChangePage('next')"
@@ -32,7 +32,7 @@ export default {
       type: Object,
       default: () => ({
         page: 1,
-        total: 1,
+        total: 0,
         hasNextPage: false
       })
     },

package/packages/select/src/CustomSelect/components/select-pages.vue

@@ -1,53 +0,0 @@
-<template functional>
-  <div class="form-select-btn" @mousedown="e => e.preventDefault()">
-    <c-button :disabled="props.PagerConfig.page <= 1" type="dashed" block @click.self.stop="props.ChangePage('prev')"> <c-icon type="left" /> 上一页 </c-button>
-    <c-button :disabled="props.PagerConfig.page >= props.PagerConfig.total" type="dashed" block @click.self.stop="props.ChangePage('next')"> 下一页 <c-icon type="right" /> </c-button>
-  </div>
-</template>
-
-<script>
-import button from '~/button';
-import icon from '~/icon';
-export default {
-  name: 'selectPages',
-  components: {
-    [button.name]: button,
-    [icon.name]: icon
-  },
-  props: {
-    PagerConfig: {
-      type: Object,
-      default: () => ({
-        page: 1,
-        total: 1
-      })
-    },
-    ChangePage: {
-      type: Function,
-      default: () => {}
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.form-select-btn {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  border-top: 1px solid #d5d5d5;
-  /deep/ .ant-btn {
-    border: none;
-    &:hover {
-      opacity: 0.7;
-    }
-  }
-  /deep/ .ant-btn-dashed[disabled] {
-    background-color: #fff !important;
-  }
-
-  .ant-btn + .ant-btn {
-    border-left: 1px solid #d5d5d5;
-  }
-}
-</style>

package/packages/table-filter/src/components/multi-select/select-pages.vue

@@ -1,72 +0,0 @@
-<template functional>
-  <div class="form-select-btn" @mousedown="e => e.preventDefault()">
-    <a-button
-      :disabled="props.searchPageConfig.page <= 1"
-      type="dashed"
-      block
-      @click.self.stop="props.handleSearchChangePage('prev')"
-    >
-      <a-icon type="left" /> 上一页
-    </a-button>
-    <a-button
-      :disabled="!props.searchPageConfig.hasNextPage"
-      type="dashed"
-      block
-      @click.self.stop="props.handleSearchChangePage('next')"
-    >
-      下一页 <a-icon type="right" />
-    </a-button>
-  </div>
-</template>
-
-<script>
-import {Button,Icon} from 'ant-design-vue'
-export default {
-  name: "selectPages",
-  components:{
-    [Button.name]:Button,
-    [Icon.name]:Icon
-  },
-  props: {
-    searchPageConfig: {
-      type: Object,
-      default: () => ({
-        page: 1,
-        total: 1,
-        hasNextPage: false
-      })
-    },
-    handleSearchChangePage: {
-      type: Function,
-      default: () => {}
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.form-select-btn {
-  width: 100%;
-  overflow: hidden;
-  display: flex;
-  justify-content: space-around;
-  border-top: 1px solid #d5d5d5;
-  border-bottom-right-radius: 4px;
-  border-bottom-left-radius: 4px;
-  /deep/ .ant-btn {
-    border: none;
-    border-radius: 0 0 4px 4px;
-    &:hover {
-      opacity: 0.7;
-    }
-  }
-  /deep/ .ant-btn-dashed[disabled] {
-    background-color: #fff !important;
-  }
-
-  .ant-btn + .ant-btn {
-    border-left: 1px solid #d5d5d5;
-    border-bottom-left-radius: 0;
-  }
-}
-</style>