vue2-client 1.12.90 → 1.12.93

package/package.json

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

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

@@ -62,6 +62,7 @@
 import { Calendar, Button } from 'ant-design-vue'
 import moment from 'moment'
 import 'moment/locale/zh-cn'
+import { getConfigByName } from '@vue2-client/services/api/common'
 
 // 设置中文
 moment.locale('zh-cn')
@@ -114,7 +115,8 @@ const defaultConfig = {
     backToToday: 'back-to-today',
     action: 'action',
     add: 'add',
-    monthChange: 'month-change'
+    monthChange: 'month-change',
+    init: 'init'
   }
 }
 
@@ -142,8 +144,7 @@ export default {
     }
   },
   created () {
-    // 深度合并配置
-    this.mergedConfig = this.mergeConfig(defaultConfig, this.config)
+    this.getData(this.config)
   },
   computed: {
     // 使用计算属性访问合并后的配置
@@ -161,6 +162,14 @@ export default {
     }
   },
   methods: {
+    // 获取配置
+    getData (config) {
+      getConfigByName(config, 'af-his', res => {
+        // 深度合并配置
+        this.mergedConfig = this.mergeConfig(defaultConfig, res)
+        this.$emit(this.mergedConfig.events.init, this.currentDate)
+      })
+    },
     // 深度合并配置
     mergeConfig (defaultConfig, userConfig) {
       const result = { ...defaultConfig }
@@ -222,6 +231,15 @@ export default {
     handleAdd (action) {
       this.$emit(this.config.events.add, this.currentDate)
     }
+  },
+  watch: {
+    // 监听配置参数名称变化
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue)
+      },
+      deep: true,
+    }
   }
 }
 </script>