vue2-client 1.10.32 → 1.10.33

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -550,32 +550,16 @@
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
       :prop="attr.prop ? attr.prop : attr.model">
-      <a-input
-        v-if="mode === '新增/修改'"
+      <x-interval-picker
         v-model="form[attr.model]"
-        :whitespace="true"
+        :mode="mode"
         :read-only="readOnly"
         :disabled="disabled && !readOnly"
-        style="width:100%"
-        @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
-        :ref="`${attr.model}input`"/>
-      <a-input-group v-else compact>
-        <a-input
-          v-model="form[attr.model][0]"
-          class="intervalPicker-begin"
-          placeholder="起始值"/>
-        <a-input
-          class="intervalPicker-center"
-          style="backgroundColor: #fff"
-          placeholder="~"
-          disabled
-        />
-        <a-input
-          v-model="form[attr.model][1]"
-          class="intervalPicker-end"
-          placeholder="结束值"/>
-      </a-input-group>
+        :start-placeholder="attr.startPlaceholder || '起始值'"
+        :end-placeholder="attr.endPlaceholder || '结束值'"
+        @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
+      />
     </a-form-model-item>
   </x-form-col>
   <!--  车牌号选择  -->
@@ -659,6 +643,7 @@ import XStatusButton from './XStatusButton.vue'
 import XClickChangeBtn from './itemComponent/XClickChangeBtn'
 import 'moment/locale/zh-cn'
 import XFormDatePicker from '@vue2-client/base-client/components/common/XDatePicker/index.vue'
+import XIntervalPicker from '@vue2-client/base-client/components/common/XIntervalPicker/XIntervalPicker.vue'
 
 export default {
   name: 'XFormItem',
@@ -676,7 +661,8 @@ export default {
     AddressSearchCombobox,
     Upload,
     XStatusButton,
-    XClickChangeBtn
+    XClickChangeBtn,
+    XIntervalPicker
   },
   data () {
     // 检索去抖
@@ -1259,28 +1245,4 @@ export default {
   position: absolute;
   z-index: 1050;
 }
-
-.intervalPicker-begin {
-  width: calc(50% - 14px);
-}
-
-.intervalPicker-center {
-  width: 30px;
-  border-left: 0;
-  pointer-events: none;
-}
-
-.intervalPicker-end {
-  width: calc(50% - 14px);
-  border-left: 0;
-}
-
-//.label-box{
-//  width: 80%;
-//  display: inline-block;
-//  height: auto;
-//  white-space: break-spaces;
-//  line-height: 18px;
-//  text-align: left;
-//}
 </style>

package/src/base-client/components/common/XFormCol/XFormCol.vue

@@ -108,7 +108,7 @@ export default {
   methods: {
     getFlex (parentWidth, flex = defaultFlex) {
       if (parentWidth === 0) {
-        return flex.xs
+        return flex.md
       }
       if (parentWidth < BREAKPOINTS.xs) return flex.xs
       if (parentWidth < BREAKPOINTS.sm) return flex.sm