vue2-client 1.4.39 → 1.4.40

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.4.37 - 1.4.39 -2022-10-18 @苗艳强**
+**1.4.37 - 1.4.40 -2022-10-28 @苗艳强**
 - 功能修改：
 - 新增文件列表展示组件
 - 新增图片列表展示组件
@@ -9,6 +9,8 @@
 - 图片列表展示组件新增宽度设置
 - 售后工单详情可查看问题描述、图片、附件
 - XFormTable可指定id进行修改操作
+- 查询表单日期改为区间
+- 日期选择器可设置时分秒
 
 **1.4.36 -2022-10-18 @江超**
 - 功能修改：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.39",
+  "version": "1.4.40",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -202,7 +202,14 @@
     :xl="xl"
     :xxl="xxl">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <a-date-picker v-model="form[attr.model]" :disabled="disabled" :show-time="true" valueFormat="YYYY-MM-DD"/>
+      <a-range-picker
+        v-if="mode === '查询'"
+        v-model="form[attr.model]"
+        :disabled="disabled"
+        :show-time="{ defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] }"
+        format="YYYY-MM-DD"
+        valueFormat="YYYY-MM-DD HH:mm:ss" />
+      <a-date-picker v-else v-model="form[attr.model]" :disabled="disabled" :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }" valueFormat="YYYY-MM-DD HH:mm:ss"/>
     </a-form-model-item>
   </x-form-col>
   <!-- 级联选择器 -->
@@ -292,6 +299,7 @@ import CitySelect from '@vue2-client/base-client/components/common/CitySelect'
 import PersonSetting from '@vue2-client/base-client/components/common/PersonSetting'
 import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
 import Upload from '@vue2-client/base-client/components/common/Upload'
+import moment from 'moment'
 
 export default {
   name: 'XFormItem',
@@ -312,7 +320,9 @@ export default {
       lastFetchId: 0,
       // 检索中
       searching: false,
-      searchResult: ''
+      searchResult: '',
+      // moment
+      moment
     }
   },
   props: {

package/src/config/CreateQueryConfig.js

@@ -161,12 +161,12 @@ module.exports = {
     {
       label: '日期格式化',
       key: 'date',
-      match: ['rangePicker']
+      match: ['rangePicker', 'datePicker']
     },
     {
       label: '日期时间格式化',
       key: 'dateTime',
-      match: ['rangePicker']
+      match: ['rangePicker', 'datePicker']
     },
     {
       label: '操作列',
@@ -181,7 +181,7 @@ module.exports = {
     {
       label: '相等[=]',
       key: '=',
-      match: ['input', 'select', 'radio', 'monthPicker', 'datePicker', 'selects', 'addressSearch', 'citySelect']
+      match: ['input', 'select', 'radio', 'monthPicker', 'selects', 'addressSearch', 'citySelect']
     },
     {
       label: '不相等[!=]',
@@ -206,22 +206,22 @@ module.exports = {
     {
       label: '大于[>]',
       key: '>',
-      match: ['input', 'radio', 'monthPicker', 'datePicker']
+      match: ['input', 'radio', 'monthPicker']
     },
     {
       label: '大于等于[>=]',
       key: '>=',
-      match: ['input', 'radio', 'monthPicker', 'datePicker']
+      match: ['input', 'radio', 'monthPicker']
     },
     {
       label: '小于[<]',
       key: '<',
-      match: ['input', 'radio', 'monthPicker', 'datePicker']
+      match: ['input', 'radio', 'monthPicker']
     },
     {
       label: '小于等于[<=]',
       key: '<=',
-      match: ['input', 'radio', 'monthPicker', 'datePicker']
+      match: ['input', 'radio', 'monthPicker']
     },
     {
       label: '包含[in]',
@@ -236,7 +236,7 @@ module.exports = {
     {
       label: '之间[between]',
       key: 'BETWEEN',
-      match: ['rangePicker']
+      match: ['rangePicker', 'datePicker']
     }
   ],
   // 新增/修改场景类型