vue2-client 1.12.93 → 1.12.95

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

@@ -42,12 +42,11 @@
 </template>
 
 <script>
-import dayjs from 'dayjs'
-import 'dayjs/locale/zh-cn'
+import moment from 'moment'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
-// 设置 dayjs 为中文语言环境
-dayjs.locale('zh-cn')
+// 设置 moment 为中文语言环境
+moment.locale('zh-cn')
 
 export default {
   name: 'XTimeline',
@@ -62,7 +61,7 @@ export default {
     // 配置参数名称，用于获取时间轴配置
     queryParamsName: {
       type: String,
-      default: ''
+      default: 'XTimelineExampleConfig'
     }
   },
 
@@ -72,7 +71,7 @@ export default {
   data () {
     return {
       currentDate: this.modelValue, // 当前选中日期
-      baseDate: dayjs().format('YYYY-MM-DD'), // 基准日期，默认今天，用于计算显示范围
+      baseDate: moment().format('YYYY-MM-DD'), // 基准日期，默认今天，用于计算显示范围
       config: null,
       disabledDates: [] // 禁用日期列表
     }
@@ -82,18 +81,15 @@ export default {
     displayDates () {
       const dates = []
       // 计算当前日期所在周的周一
-      const currentDay = dayjs(this.baseDate)
+      const currentDay = moment(this.baseDate)
       const dayOfWeek = currentDay.day() || 7 // 获取星期几，将周日的0转换为7
-      const mondayOfWeek = currentDay.subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
+      const mondayOfWeek = currentDay.clone().subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
 
       // 从周一开始，生成一周的日期
       dates.push(mondayOfWeek.format('YYYY-MM-DD')) // 周一
-      dates.push(dayjs(mondayOfWeek).add(1, 'day').format('YYYY-MM-DD')) // 周二
-      dates.push(dayjs(mondayOfWeek).add(2, 'day').format('YYYY-MM-DD')) // 周三
-      dates.push(dayjs(mondayOfWeek).add(3, 'day').format('YYYY-MM-DD')) // 周四
-      dates.push(dayjs(mondayOfWeek).add(4, 'day').format('YYYY-MM-DD')) // 周五
-      dates.push(dayjs(mondayOfWeek).add(5, 'day').format('YYYY-MM-DD')) // 周六
-      dates.push(dayjs(mondayOfWeek).add(6, 'day').format('YYYY-MM-DD')) // 周日
+      for (let i = 1; i <= 6; i++) {
+        dates.push(mondayOfWeek.clone().add(i, 'day').format('YYYY-MM-DD'))
+      }
 
       return dates
     }
@@ -167,28 +163,28 @@ export default {
     // 格式化日期显示
     formatDate (date) {
       const format = this.config?.dateFormat || 'MM/DD'
-      return dayjs(date).format(format)
+      return moment(date).format(format)
     },
 
     // 获取星期显示
     getWeekDay (date) {
       const format = this.config?.weekFormat || '周dd'
-      return dayjs(date).format(format)
+      return moment(date).format(format)
     },
 
     // 判断是否为周末
     isWeekend (date) {
       if (!this.config?.highlightWeekend) return false
-      const day = dayjs(date).day()
+      const day = moment(date).day()
       return day === 0 || day === 6
     },
 
     // 判断日期是否禁用
     isDisabled (date) {
-      if (this.config?.minDate && dayjs(date).isBefore(this.config.minDate)) {
+      if (this.config?.minDate && moment(date).isBefore(this.config.minDate)) {
         return true
       }
-      if (this.config?.maxDate && dayjs(date).isAfter(this.config.maxDate)) {
+      if (this.config?.maxDate && moment(date).isAfter(this.config.maxDate)) {
         return true
       }
       return this.disabledDates.includes(date)
@@ -197,7 +193,7 @@ export default {
     // 判断是否为当前选中日期
     isCurrentDate (date) {
       if (!this.currentDate) return false
-      return dayjs(date).format('YYYY-MM-DD') === dayjs(this.currentDate).format('YYYY-MM-DD')
+      return moment(date).format('YYYY-MM-DD') === moment(this.currentDate).format('YYYY-MM-DD')
     },
 
     // 选择日期
@@ -210,7 +206,7 @@ export default {
 
     // 前一天
     goToPrevDay () {
-      const newDate = dayjs(this.baseDate).subtract(1, 'day')
+      const newDate = moment(this.baseDate).subtract(1, 'day')
       if (this.config?.minDate && newDate.isBefore(this.config.minDate)) {
         return
       }
@@ -227,7 +223,7 @@ export default {
 
     // 后一天
     goToNextDay () {
-      const newDate = dayjs(this.baseDate).add(1, 'day')
+      const newDate = moment(this.baseDate).add(1, 'day')
       if (this.config?.maxDate && newDate.isAfter(this.config.maxDate)) {
         return
       }
@@ -241,12 +237,13 @@ export default {
       // 触发变更事件
       this.$emit('change', this.currentDate)
     },
+
     // 前一周
     goToPrevWeek () {
       // 计算当前日期所在周的周一
-      const currentDay = dayjs(this.baseDate)
+      const currentDay = moment(this.baseDate)
       const dayOfWeek = currentDay.day() || 7 // 获取星期几，将周日的0转换为7
-      const mondayOfWeek = currentDay.subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
+      const mondayOfWeek = currentDay.clone().subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
 
       // 前一周的周一
       const newDate = mondayOfWeek.subtract(7, 'day')
@@ -261,9 +258,9 @@ export default {
     // 后一周
     goToNextWeek () {
       // 计算当前日期所在周的周一
-      const currentDay = dayjs(this.baseDate)
+      const currentDay = moment(this.baseDate)
       const dayOfWeek = currentDay.day() || 7 // 获取星期几，将周日的0转换为7
-      const mondayOfWeek = currentDay.subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
+      const mondayOfWeek = currentDay.clone().subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
       // 后一周的周一
       const newDate = mondayOfWeek.add(7, 'day')
       if (this.config?.maxDate && newDate.isAfter(this.config.maxDate)) {

package/src/base-client/components/his/XList/XList.vue

@@ -1,128 +1,137 @@
-<template>
-  <div class="list-wrapper">
-    <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container" ref="listRef">
-      <a-list-item slot="renderItem" slot-scope="item, index" class="list-item" @click="handleClick(index)">
-        <i
-          v-if="icon"
-          class="icon-menu"
-          :style="getIconStyle(item)"
-        ></i>
-        <span
-          class="item-text">
-          {{ item.number }} {{ item.name }}
-        </span>
-        <a-button v-if="button" type="link" class="confirm-btn" @click.stop="click(index)">{{ buttonName }}</a-button>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XList',
-  props: {
-    queryParamsName: {
-      type: Object,
-      default: 'outpatientWaitConfig'
-    }
-  },
-  inject: ['getComponentByName'],
-  data () {
-    return {
-      data: [],
-      button: false,
-      icon: false,
-      buttonName: ''
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    async getData (config) {
-      getConfigByName(config, 'af-his', res => {
-        this.button = res.button
-        this.icon = res.icon
-        this.buttonName = res.buttonName
-        runLogic(res.mainSource, {}, 'af-his').then(resData => {
-          this.data = resData
-        })
-      })
-    },
-    handleClick (index) {
-      this.$emit('listClick', this.data[index])
-    },
-    refreshList () {
-      this.getData(this.queryParamsName)
-    },
-    click (index) {
-      this.$emit('click', this.data[index + 1])
-    },
-    getIconStyle (item) {
-      return item.picture
-        ? { backgroundImage: `url(${item.picture})` }
-        : {}
-    }
-  }
-}
-</script>
-
-<style scoped>
-.list-wrapper {
-  max-height: 240px;
-  overflow-y: auto;
-  padding-right: 2px;
-}
-
-.list-container {
-  width: 100%;
-}
-
-.list-item {
-  height: 35px;
-  border-radius: 6px;
-  background-color: #F4F4F4;
-  padding: 8px 15px;
-  font-size: 16px;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  border: 1px solid #D9D9D9;
-  box-sizing: border-box;
-  margin-bottom: 8px !important;
-}
-
-.icon-menu {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  background-color: #ccc;
-  margin-right: 8px;
-}
-
-.item-text {
-  flex: 1;
-}
-
-.confirm-btn {
-  margin-left: auto;
-  padding: 0 8px;
-}
-
-/* 自定义滚动条样式 */
-.list-wrapper::-webkit-scrollbar {
-  width: 6px;
-}
-
-.list-wrapper::-webkit-scrollbar-thumb {
-  background-color: #d9d9d9;
-  border-radius: 3px;
-}
-
-.list-wrapper::-webkit-scrollbar-track {
-  background-color: #f0f0f0;
-}
-</style>
+<template>
+  <div class="list-wrapper">
+    <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container" ref="listRef">
+      <a-list-item slot="renderItem" slot-scope="item, index" class="list-item" @click="handleClick(index)">
+        <i
+          v-if="icon"
+          class="icon-menu"
+          :style="getIconStyle(item)"
+        ></i>
+        <span
+          class="item-text">
+          {{ item.number }} {{ item.name }}
+        </span>
+        <a-button v-if="button" type="link" class="confirm-btn" @click.stop="click(index)">{{ buttonName }}</a-button>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XList',
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    }
+  },
+  inject: ['getComponentByName'],
+  data () {
+    return {
+      data: [],
+      button: false,
+      icon: false,
+      buttonName: ''
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+        runLogic(config, {}, 'af-his').then(res => {
+          this.button = res.button
+          this.icon = res.icon
+          this.buttonName = res.buttonName
+          this.data = res.data
+        })
+    },
+    handleClick (index) {
+      this.$emit('listClick', this.data[index])
+    },
+    refreshList () {
+      this.getData(this.queryParamsName)
+    },
+    click (index) {
+      this.$emit('click', this.data[index + 1])
+    },
+    getIconStyle (item) {
+      return item.picture
+        ? { backgroundImage: `url(${item.picture})` }
+        : {}
+    },
+    filterDataById (id) {
+      const filteredData = this.data.filter(item => item.id === id)
+      this.data = filteredData
+    }
+  }
+}
+</script>
+
+<style scoped>
+.list-wrapper {
+  max-height: 240px;
+  overflow-y: auto;
+  padding-right: 2px;
+}
+
+.list-container {
+  width: 100%;
+}
+
+.list-item {
+  height: 35px;
+  border-radius: 6px;
+  background-color: #F4F4F4;
+  padding: 8px 15px;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  border: 1px solid #D9D9D9;
+  box-sizing: border-box;
+  margin-bottom: 8px !important;
+}
+
+.icon-menu {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  background-color: #ccc;
+  margin-right: 8px;
+}
+
+.item-text {
+  flex: 1;
+}
+
+.confirm-btn {
+  margin-left: auto;
+  padding: 0 8px;
+}
+
+/* 高亮样式 */
+.highlight-item {
+  background-color: #e6f7ff;
+  border: 1px solid #1890ff;
+  transition: all 0.3s;
+}
+
+/* 自定义滚动条样式 */
+.list-wrapper::-webkit-scrollbar {
+  width: 6px;
+}
+
+.list-wrapper::-webkit-scrollbar-thumb {
+  background-color: #d9d9d9;
+  border-radius: 3px;
+}
+
+.list-wrapper::-webkit-scrollbar-track {
+  background-color: #f0f0f0;
+}
+</style>

package/src/base-client/components/his/XTimeSelect/XTimeSelect.vue

@@ -1,99 +1,99 @@
-<template>
-  <div class="x-time-select">
-    <a-range-picker
-      :value="dateRange"
-      :placeholder="['开始日期', '结束日期']"
-      separator="至"
-      :disabled="disabled"
-      :allowClear="allowClear"
-      :format="format"
-      @change="handleDateChange"
-    />
-  </div>
-</template>
-
-<script>
-import dayjs from 'dayjs'
-
-export default {
-  name: 'XTimeSelect',
-  props: {
-    value: {
-      type: Array,
-      default: () => []
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    allowClear: {
-      type: Boolean,
-      default: true
-    },
-    format: {
-      type: String,
-      default: 'YYYY/MM/DD'
-    }
-  },
-  data () {
-    return {
-      dateRange: []
-    }
-  },
-  watch: {
-    value: {
-      handler (newVal) {
-        if (newVal && newVal.length === 2) {
-          this.dateRange = [
-            newVal[0] ? dayjs(newVal[0]) : null,
-            newVal[1] ? dayjs(newVal[1]) : null
-          ]
-        } else {
-          this.dateRange = []
-        }
-      },
-      immediate: true,
-      deep: true
-    }
-  },
-  methods: {
-    handleDateChange (dates, dateStrings) {
-      this.dateRange = dates
-      console.warn(dateStrings)
-      this.$emit('change', dateStrings)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.x-time-select {
-  position: relative;
-  width: 100%;
-  box-sizing: border-box;
-  display: block;
-}
-.x-time-select :deep(.ant-picker-range),
-.x-time-select :deep(.ant-picker) {
-  width: 100%;
-  height: 30px;
-  border-radius: 7px;
-  background: #FFFFFF;
-  border: 1px solid #E5E9F0;
-}
-.x-time-select :deep(.ant-calendar-picker) {
-  width: 100%;
-  display: block;
-}
-.x-time-select :deep(.ant-calendar-picker-input) {
-  width: 100%;
-  height: 30px;
-  border-radius: 7px;
-  background: #FFFFFF;
-  border: 1px solid #E5E9F0;
-}
-
-.x-time-select :deep(.ant-input) {
-  width: 100%;
-}
-</style>
+<template>
+  <div class="x-time-select">
+    <a-range-picker
+      :value="dateRange"
+      :placeholder="['开始日期', '结束日期']"
+      separator="至"
+      :disabled="disabled"
+      :allowClear="allowClear"
+      :format="format"
+      @change="handleDateChange"
+    />
+  </div>
+</template>
+
+<script>
+import moment from 'moment'
+
+export default {
+  name: 'XTimeSelect',
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    allowClear: {
+      type: Boolean,
+      default: true
+    },
+    format: {
+      type: String,
+      default: 'YYYY/MM/DD'
+    }
+  },
+  data () {
+    return {
+      dateRange: []
+    }
+  },
+  watch: {
+    value: {
+      handler (newVal) {
+        if (newVal && newVal.length === 2) {
+          this.dateRange = [
+            newVal[0] ? moment(newVal[0]) : null,
+            newVal[1] ? moment(newVal[1]) : null
+          ]
+        } else {
+          this.dateRange = []
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    handleDateChange (dates, dateStrings) {
+      this.dateRange = dates
+      console.warn(dateStrings)
+      this.$emit('change', dateStrings)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-time-select {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  display: block;
+}
+.x-time-select :deep(.ant-picker-range),
+.x-time-select :deep(.ant-picker) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+.x-time-select :deep(.ant-calendar-picker) {
+  width: 100%;
+  display: block;
+}
+.x-time-select :deep(.ant-calendar-picker-input) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+
+.x-time-select :deep(.ant-input) {
+  width: 100%;
+}
+</style>

package/src/components/STable/index.js

@@ -223,6 +223,9 @@ export default {
         })
       }
     },
+    setLocalDataSource (data) {
+      this.localDataSource = data
+    },
     initTotalList (columns) {
       const totalList = []
       columns && columns instanceof Array && columns.forEach(column => {

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

@@ -52,10 +52,10 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
-  component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),