vue2-client 1.12.94 → 1.12.96

package/package.json

@@ -1,109 +1,107 @@
-{
-  "name": "vue2-client",
-  "version": "1.12.94",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "dayjs": "^1.11.13",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-draggable-resizable": "^2",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@jest/globals": "^29.7.0",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.12.96",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-draggable-resizable": "^2",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

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

@@ -128,9 +128,9 @@ export default {
   },
   props: {
     // 接收配置
-    config: {
-      type: Object,
-      default: () => ({})
+    configName: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -144,11 +144,10 @@ export default {
     }
   },
   created () {
-    this.getData(this.config)
+    this.getData(this.configName)
   },
   computed: {
     // 使用计算属性访问合并后的配置
-    // eslint-disable-next-line vue/no-dupe-keys
     config () {
       return this.mergedConfig
     },
@@ -164,6 +163,7 @@ export default {
   methods: {
     // 获取配置
     getData (config) {
+      console.warn(config)
       getConfigByName(config, 'af-his', res => {
         // 深度合并配置
         this.mergedConfig = this.mergeConfig(defaultConfig, res)

package/src/base-client/components/common/XCalendar/index.md

@@ -0,0 +1,284 @@
+# XCalendar
+
+基于 Ant Design Vue Calendar 的可配置日历组件，支持自定义标题、导航、样式等功能。
+
+## 何时使用
+
+当需要在界面中展示一个功能丰富的日历，并且需要：
+- 自定义日历的标题和导航
+- 添加自定义操作按钮
+- 自定义样式和布局
+- 响应日期选择和月份切换事件
+
+## 引用方式
+
+```javascript
+import XCalendar from '@vue2-client/base-client/components/common/XCalendar/XCalendar'
+
+export default {
+  components: {
+    XCalendar
+  }
+}
+```
+
+## 代码演示
+
+```html
+<x-calendar
+  :configName="calendarConfigName"
+  @select="handleSelect"
+  @monthChange="handleMonthChange"
+  @action="handleAction">
+</x-calendar>
+```
+
+## API
+
+### Props
+
+| 参数 | 说明 | 类型 | 默认值 |
+|------|------|------|------|
+| configName | 配置名称，用于从后端获取配置 | String | '' |
+
+### 事件
+
+| 事件名 | 说明 | 回调参数 |
+|------|------|------|
+| select | 选择日期时触发 | function(date: Moment) |
+| back-to-today | 点击"返回当天"按钮时触发 | function(date: Moment) |
+| action | 点击操作按钮时触发 | function(date: Moment) |
+| add | 点击新增按钮时触发 | function(date: Moment) |
+| month-change | 切换月份时触发 | function(date: Moment) |
+
+## 配置说明
+
+组件通过 `configName` 从后端获取配置，配置格式如下：
+
+### 完整配置结构
+
+```json
+{
+  "header": {
+    "show": true,
+    "title": "我的日程",
+    "showIcon": true,
+    "showBackToToday": true,
+    "backToTodayText": "返回当天",
+    "showMonth": true,
+    "showDay": true,
+    "monthClickable": false,
+    "dayClickable": false
+  },
+  "subHeader": {
+    "show": true,
+    "showNavigation": true,
+    "prevMonthText": "←",
+    "nextMonthText": "→"
+  },
+  "calendar": {
+    "fullscreen": false,
+    "locale": "zh-cn"
+  },
+  "actions": [
+    {
+      "text": "+ 新增日程",
+      "type": "add",
+      "handler": "handleAdd"
+    }
+  ],
+  "styles": {
+    "wrapper": {},
+    "header": {},
+    "titleInput": {},
+    "subHeader": {},
+    "currentDate": {},
+    "year": {},
+    "actionItem": {},
+    "calendarContent": {}
+  },
+  "events": {
+    "select": "select",
+    "backToToday": "back-to-today",
+    "action": "action",
+    "add": "add",
+    "monthChange": "month-change"
+  }
+}
+```
+
+### 配置项详细说明
+
+#### 1. header 配置
+
+| 参数 | 说明 | 类型 | 默认值 |
+|------|------|------|------|
+| show | 是否显示头部 | boolean | true |
+| title | 标题文本 | string | '我的日程' |
+| showIcon | 是否显示图标 | boolean | true |
+| showBackToToday | 是否显示返回今天按钮 | boolean | true |
+| backToTodayText | 返回今天按钮文本 | string | '返回当天' |
+| showMonth | 是否显示月份 | boolean | true |
+| showDay | 是否显示日期 | boolean | true |
+| monthClickable | 月份是否可点击 | boolean | false |
+| dayClickable | 日期是否可点击 | boolean | false |
+
+#### 2. subHeader 配置
+
+| 参数 | 说明 | 类型 | 默认值 |
+|------|------|------|------|
+| show | 是否显示子标题栏 | boolean | true |
+| showNavigation | 是否显示导航按钮 | boolean | true |
+| prevMonthText | 上个月按钮文本 | string | '←' |
+| nextMonthText | 下个月按钮文本 | string | '→' |
+
+#### 3. calendar 配置
+
+| 参数 | 说明 | 类型 | 默认值 |
+|------|------|------|------|
+| fullscreen | 是否全屏显示 | boolean | false |
+| locale | 语言设置 | string | 'zh-cn' |
+
+#### 4. actions 配置
+
+每个操作按钮的配置项：
+
+| 参数 | 说明 | 类型 | 示例 |
+|------|------|------|------|
+| text | 按钮显示文本 | string | '+ 新增日程' |
+| type | 按钮类型标识 | string | 'add' |
+| handler | 处理函数名称 | string | 'handleAdd' |
+
+#### 5. styles 配置
+
+所有样式配置都接受标准的 CSS 属性对象：
+
+| 参数 | 说明 | 类型 | 示例 |
+|------|------|------|------|
+| wrapper | 整体容器样式 | object | { background: '#fff' } |
+| header | 头部样式 | object | { padding: '16px' } |
+| titleInput | 标题输入框样式 | object | { fontSize: '16px' } |
+| subHeader | 子标题栏样式 | object | { marginBottom: '20px' } |
+| currentDate | 当前日期样式 | object | { color: '#1890ff' } |
+| year | 年份样式 | object | { fontSize: '14px' } |
+| actionItem | 操作按钮样式 | object | { cursor: 'pointer' } |
+| calendarContent | 日历内容区域样式 | object | { padding: '24px' } |
+
+## 使用示例
+
+### 1. 基础使用
+
+```html
+<template>
+  <x-calendar :configName="'MyCalendarConfig'" @select="onSelect" />
+</template>
+
+<script>
+export default {
+  methods: {
+    onSelect(date) {
+      console.log('选择的日期：', date.format('YYYY-MM-DD'))
+    }
+  }
+}
+</script>
+```
+
+### 2. 自定义样式配置
+
+```json
+{
+  "styles": {
+    "wrapper": {
+      "backgroundColor": "#f5f5f5",
+      "padding": "24px",
+      "borderRadius": "8px"
+    },
+    "header": {
+      "borderBottom": "1px solid #e8e8e8",
+      "marginBottom": "16px"
+    },
+    "currentDate": {
+      "fontSize": "24px",
+      "fontWeight": "bold",
+      "color": "#1890ff"
+    }
+  }
+}
+```
+
+### 3. 自定义操作按钮
+
+```json
+{
+  "actions": [
+    {
+      "text": "+ 新增日程",
+      "type": "add",
+      "handler": "handleAdd"
+    },
+    {
+      "text": "查看详情",
+      "type": "view",
+      "handler": "handleView"
+    }
+  ]
+}
+```
+
+## 注意事项
+
+1. 组件使用 moment.js 处理日期，确保项目中已正确配置
+2. 样式配置支持所有合法的 CSS 属性，使用驼峰命名
+3. 自定义事件处理函数需要在父组件中实现
+4. 所有配置项都是可选的，未配置时使用默认值
+5. 语言设置默认为中文，可通过 calendar.locale 配置修改
+6. 样式配置支持响应式设计，可根据需要调整
+
+## 常见问题
+
+### 1. 如何修改日历的默认语言？
+
+通过 calendar 配置项设置：
+```json
+{
+  "calendar": {
+    "locale": "en-us"
+  }
+}
+```
+
+### 2. 如何自定义日期显示格式？
+
+可以通过监听 select 事件，在回调函数中自定义格式化：
+```javascript
+onSelect(date) {
+  const formattedDate = date.format('YYYY年MM月DD日')
+}
+```
+
+### 3. 如何添加自定义操作按钮？
+
+在配置中的 actions 数组中添加按钮配置：
+```json
+{
+  "actions": [
+    {
+      "text": "自定义按钮",
+      "type": "custom",
+      "handler": "handleCustom"
+    }
+  ]
+}
+```
+
+### 4. 如何处理按钮点击事件？
+
+在父组件中实现对应的处理函数：
+```javascript
+methods: {
+  handleCustom(date) {
+    console.log('自定义按钮点击，当前日期：', date.format('YYYY-MM-DD'))
+  }
+}
+```

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

@@ -175,7 +175,7 @@ export default {
       this.activeKey = keys
     },
     onSearch (value, panelIndex) {
-      console.log('搜索内容：', value, '面板索引：', panelIndex)
+      this.$emit('searchChange', { value: value, panelIndex: panelIndex })
     },
   },
   watch: {

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

@@ -2,6 +2,7 @@
   <a-card :bordered="false">
     <a-button @click="()=>{queryParamsName = 'crud_device_realtime_upload_物联网流量计'}">测试1</a-button>
     <a-button @click="()=>{queryParamsName = 'crud_device_realtime_upload_LaiDe_TiaoYaXiang'}">测试2</a-button>
+    <a-button @click="test()">测试3</a-button>
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
@@ -16,6 +17,7 @@
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
+
 export default {
   name: 'Demo',
   components: {
@@ -36,6 +38,9 @@ export default {
     }
   },
   methods: {
+    test () {
+      this.$refs.xFormTable.setTableData([])
+    },
     defaultF () {
       this.$refs.xFormTable.setTableSize('default')
     },
@@ -46,7 +51,11 @@ export default {
       this.$refs.xFormTable.setTableSize('small')
     },
     columnClick (key, value, record) {
-      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
+      microDispatch({
+        type: 'v3route',
+        path: '/bingliguanli/dianzibingliluru',
+        props: { selected: arguments[0].his_f_admission_id }
+      })
     },
     action (record, id, actionType) {
       this.detailVisible = true
@@ -58,8 +67,7 @@ export default {
       this.$refs.xFormTable.refreshTable(true)
     }
   },
-  computed: {
-  },
+  computed: {},
 }
 </script>
 

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

@@ -1272,7 +1272,7 @@ export default {
         // 普通模式
         this.$nextTick(() => {
           if (this.$refs.table) {
-            this.$refs.table.localDataSource = [...data]
+            this.$refs.table.setLocalDataSource(data)
           }
         })
       }

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -154,6 +154,9 @@ export default {
   },
   inject: ['tableContext'],
   methods: {
+    setLocalDataSource (data) {
+      this.$refs.table.setLocalDataSource(data)
+    },
     loadData () {
       if (this.loadSelectedData) {
         return this.loadSelectedDataGen

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

@@ -63,6 +63,11 @@ export default {
       return item.picture
         ? { backgroundImage: `url(${item.picture})` }
         : {}
+    },
+    filterData (par) {
+      runLogic(this.queryParamsName, par, 'af-his').then(res => {
+        this.data = res.data
+      })
     }
   }
 }

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'),