vue2-client 1.9.152 → 1.9.154

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.152",
+  "version": "1.9.154",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XDatePicker/index.vue

@@ -1,5 +1,5 @@
 <script>
-import XFormCol from '@/base-client/components/common/XFormCol'
+import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
 import moment from 'moment'
 
 export default {

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

@@ -217,7 +217,7 @@ export default {
           end = moment().format(format)
           break
         default:
-          return defaultValue
+          return undefined
       }
       if (['monthPicker', 'yearPicker', 'datePicker'].includes(type)) {
         if (queryType === 'BETWEEN') {
@@ -251,8 +251,10 @@ export default {
           this.defaultMap[item.model] = formData[item.model]
         }
       } else {
-        if (item.type === 'intervalPicker') {
-          formData[item.model] = ['', '']
+        if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker'].includes(item.type)) {
+          if (item.queryType === 'BETWEEN') {
+            formData[item.model] = []
+          }
         }
       }
       if (item.rule) {

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

@@ -650,7 +650,7 @@ import XLicensePlate from '@vue2-client/base-client/components/common/XLicensePl
 import XStatusButton from './XStatusButton.vue'
 import XClickChangeBtn from './itemComponent/XClickChangeBtn'
 import 'moment/locale/zh-cn'
-import XFormDatePicker from '@/base-client/components/common/XDatePicker/index.vue'
+import XFormDatePicker from '@vue2-client/base-client/components/common/XDatePicker/index.vue'
 
 export default {
   name: 'XFormItem',

package/src/base-client/components/common/XFormTable/demo.vue

@@ -4,7 +4,7 @@
       title="示例表单查询"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
-      service-name="af-system"
+      service-name="af-his"
       @action="action"
       @columnClick="columnClick"
       ref="xFormTable">
@@ -35,7 +35,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'crud_test_local_config',
+      queryParamsName: 'outpatientFeeInquiryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

package/src/router/async/router.map.js

@@ -87,8 +87,8 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-          component: () => import('@/base-client/components/common/XDatePicker/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),