vue2-client 1.12.88 → 1.12.90

package/package.json

@@ -1,109 +1,109 @@
-{
-  "name": "vue2-client",
-  "version": "1.12.88",
-  "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.90",
+  "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"
+  ]
+}

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

@@ -123,12 +123,12 @@ export default {
     }
   },
   created () {
-    this.getData(this.queryParamsName)
+    this.getData(this.queryParamsName, this.parameter)
   },
   beforeDestroy () {
   },
   methods: {
-    getComponentName(componentName) {
+    getComponentName (componentName) {
       return componentName
     },
     listClick (data) {
@@ -138,12 +138,12 @@ export default {
       const refKey = `dynamicComponent_${componentName}`
       return this.$refs[refKey]
     },
-    async getData (config) {
+    async getData (config, parameter) {
       this.configName = config
       getConfigByName(config, 'af-his', res => {
         this.config = res
         console.warn(this.config)
-        runLogic(res.mainLogic, this.parameter, 'af-his').then(result => {
+        runLogic(res.mainLogic, parameter, 'af-his').then(result => {
           this.config.showData = result
           // 更具timeType更改时间类型
           if (this.config.timeType && this.config.timeType === '.') {
@@ -159,7 +159,7 @@ export default {
       })
     },
     refreshXCollapse () {
-      this.getData(this.queryParamsName)
+      this.getData(this.queryParamsName, this.parameter)
     },
     convertToCustomFormat (dateString) {
       // 创建一个新的 Date 对象
@@ -181,7 +181,7 @@ export default {
   watch: {
     queryParamsName: {
       handler (newValue) {
-        this.getData(newValue, null)
+        this.getData(newValue, this.parameter)
       },
       deep: true
     }

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

@@ -0,0 +1,15 @@
+<template>
+  <x-collapse :query-params-name="openPrescriptionConfig" />
+</template>
+
+<script>
+import XCollapse from '@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'
+export default {
+  name: 'Demo',
+  components: { XCollapse }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -1,44 +1,44 @@
-<template>
-  <div id="test">
-    <a-card :bordered="false">
-      <XReport
-        ref="main"
-        :use-oss-for-img="false"
-        config-name="openPrescriptionCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :dont-format="true"/>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import XReport from './XReport'
-import XAddReport from '../XAddReport/XAddReport.vue'
-// eslint-disable-next-line no-unused-vars
-
-export default {
-  name: 'XReportDemo',
-  components: {
-    XReport, XAddReport
-  },
-  mounted () {
-    // this.$refs.xAddReport.init({
-    //   configName: 'skinTestExecuActionCover',
-    //   selectedId: '11111',
-    //   mixinData: {}
-    // })
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        :use-oss-for-img="false"
+        config-name="openPrescriptionCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :dont-format="true"/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from './XReport'
+import XAddReport from '../XAddReport/XAddReport.vue'
+// eslint-disable-next-line no-unused-vars
+
+export default {
+  name: 'XReportDemo',
+  components: {
+    XReport, XAddReport
+  },
+  mounted () {
+    // this.$refs.xAddReport.init({
+    //   configName: 'skinTestExecuActionCover',
+    //   selectedId: '11111',
+    //   mixinData: {}
+    // })
+  },
+  data () {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -78,16 +78,23 @@ export default {
     }
   },
   computed: {
-    // 计算需要显示的日期范围
+    // 计算需要显示的日期范围，固定显示周一到周日
     displayDates () {
       const dates = []
-      const range = this.config?.range || 7 // 显示天数，默认7天
-      const halfRange = Math.floor(range / 2)
-      let currentDate = dayjs(this.baseDate).subtract(halfRange, 'day')
-      for (let i = 0; i < range; i++) {
-        dates.push(currentDate.format('YYYY-MM-DD'))
-        currentDate = currentDate.add(1, 'day')
-      }
+      // 计算当前日期所在周的周一
+      const currentDay = dayjs(this.baseDate)
+      const dayOfWeek = currentDay.day() || 7 // 获取星期几，将周日的0转换为7
+      const mondayOfWeek = currentDay.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')) // 周日
+
       return dates
     }
   },
@@ -207,8 +214,15 @@ export default {
       if (this.config?.minDate && newDate.isBefore(this.config.minDate)) {
         return
       }
+      // 更新基准日期
       this.baseDate = newDate.format('YYYY-MM-DD')
+      // 同时选中新的日期
+      this.currentDate = this.baseDate
+      this.$emit('update:modelValue', this.currentDate)
+      // 触发前一天事件
       this.$emit('prev-day', this.baseDate)
+      // 触发变更事件
+      this.$emit('change', this.currentDate)
     },
 
     // 后一天
@@ -217,13 +231,26 @@ export default {
       if (this.config?.maxDate && newDate.isAfter(this.config.maxDate)) {
         return
       }
+      // 更新基准日期
       this.baseDate = newDate.format('YYYY-MM-DD')
+      // 同时选中新的日期
+      this.currentDate = this.baseDate
+      this.$emit('update:modelValue', this.currentDate)
+      // 触发后一天事件
       this.$emit('next-day', this.baseDate)
+      // 触发变更事件
+      this.$emit('change', this.currentDate)
     },
-
     // 前一周
     goToPrevWeek () {
-      const newDate = dayjs(this.baseDate).subtract(7, 'day')
+      // 计算当前日期所在周的周一
+      const currentDay = dayjs(this.baseDate)
+      const dayOfWeek = currentDay.day() || 7 // 获取星期几，将周日的0转换为7
+      const mondayOfWeek = currentDay.subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
+
+      // 前一周的周一
+      const newDate = mondayOfWeek.subtract(7, 'day')
+
       if (this.config?.minDate && newDate.isBefore(this.config.minDate)) {
         return
       }
@@ -233,7 +260,12 @@ export default {
 
     // 后一周
     goToNextWeek () {
-      const newDate = dayjs(this.baseDate).add(7, 'day')
+      // 计算当前日期所在周的周一
+      const currentDay = dayjs(this.baseDate)
+      const dayOfWeek = currentDay.day() || 7 // 获取星期几，将周日的0转换为7
+      const mondayOfWeek = currentDay.subtract(dayOfWeek - 1, 'day') // 减去相应的天数得到周一
+      // 后一周的周一
+      const newDate = mondayOfWeek.add(7, 'day')
       if (this.config?.maxDate && newDate.isAfter(this.config.maxDate)) {
         return
       }
@@ -278,8 +310,15 @@ export default {
   transition: all 0.3s;
 }
 
-.date-item:hover:not(.ant-btn-disabled) {
-  background: #fafafa;
+/* 非选中日期的悬浮效果 */
+.date-item:hover:not(.ant-btn-disabled):not(.ant-btn-primary) {
+  background: #e6f7ff;
+  color: #1890ff;
+}
+
+/* 选中日期不需要悬浮效果 */
+.date-item.ant-btn-primary:hover {
+  background: #1890ff;
 }
 
 .date-item.ant-btn-primary {
@@ -292,6 +331,12 @@ export default {
   color: #fff;
 }
 
+/* 非选中日期悬浮时的字体颜色 */
+.date-item:hover:not(.ant-btn-disabled):not(.ant-btn-primary) .weekday,
+.date-item:hover:not(.ant-btn-disabled):not(.ant-btn-primary) .date {
+  color: #1890ff;
+}
+
 .date-item.date-weekend:not(.ant-btn-disabled):not(.ant-btn-primary) {
   color: #ff4d4f;
 }