vue2-client 1.12.74 → 1.12.76

package/package.json

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

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

@@ -1,209 +1,209 @@
-<template>
-  <div>
-    <a-collapse
-      :activeKey="activeKey"
-      @change="handleChange"
-    >
-      <a-collapse-panel
-        v-for="(panel, panelIndex) in config.showData"
-        :key="panelIndex.toString()"
-        :show-arrow="false"
-      >
-        <template #header>
-          <div class="header-content">
-            <span
-              class="header-text"
-              :style="config.titleStyle"
-            >
-              {{ panel.title }}
-            </span>
-            <!-- 当有 title2 数据时显示信息项 -->
-            <template v-if="panel.title2 && panel.title2.length">
-              <span
-                v-for="(item, headerIndex) in panel.title2"
-                :key="headerIndex"
-                class="info-item"
-                :style="config.title2Style"
-              >
-                <span>{{ item.key }}:</span>
-                <span>{{ item.value }}</span>
-              </span>
-            </template>
-            <!-- 当有 title3 数据时显示时间项 -->
-            <span
-              v-if="panel.title3"
-              class="time-item"
-              :style="config.title3Style"
-            >
-              {{ panel.title3 }}
-            </span>
-            <!-- 修改搜索框的显示条件 -->
-            <a-input-search
-              v-if="panel.search"
-              v-model="searchText[panelIndex]"
-              placeholder="panel.searchPlace"
-              class="search-input"
-              @search="(value) => onSearch(value, panelIndex)"
-              @click.stop
-            />
-          </div>
-        </template>
-        <!-- 根据类型显示不同内容 -->
-        <template v-if="panel.type === 'picture'">
-          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
-        </template>
-        <template v-else-if="panel.type === 'cover'">
-          <x-report
-            :use-oss-for-img="false"
-            :config-name="panel.configName"
-            server-name="af-his"
-            :show-img-in-cell="true"
-            :display-only="true"
-            :edit-mode="false"
-            :show-save-button="false"
-            :no-padding="true"
-            :dont-format="true">
-          </x-report>
-        </template>
-      </a-collapse-panel>
-    </a-collapse>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XCollapse',
-  components: {
-    XReport
-  },
-  inject: ['getConfigByName', 'getComponentByName'],
-  data () {
-    return {
-      activeKey: [],
-      config: {},
-      configName: '',
-      searchText: {}
-    }
-  },
-  props: {
-    // json名
-    queryParamsName: {
-      type: Object,
-      default: 'openPrescriptionConfig'
-    },
-    parameter: {
-      type: Object,
-    }
-  },
-  created () {
-    this.searchTexts = {} // 初始化对象
-
-    this.getData(this.queryParamsName)
-    window.addEventListener('setItem', (e) => {
-      console.log('监听到sessionStorage的变化：', e)
-      if (e.key === 'klcf_id') {
-        this.newVal = sessionStorage.getItem('klcf_id')
-        // 进行业务处理
-        console.log('sessionStorage中的值发生了变化：', this.newVal)
-      }
-    })
-  },
-  beforeDestroy () {
-    window.removeEventListener('setItem', this.handleStorageChange)
-  },
-  methods: {
-    handleStorageChange (e) {
-      console.log('监听到sessionStorage的变化：', e)
-      if (e.key === 'klcf_id') {
-        this.newVal = sessionStorage.getItem('klcf_id')
-        // 进行业务处理
-        console.log('sessionStorage中的值发生了变化：', this.newVal)
-      }
-    },
-    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 => {
-          this.config.showData = result
-          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
-        })
-      })
-    },
-    refreshXCollapse () {
-      this.getData(this.queryParamsName)
-    },
-    handleChange (keys) {
-      this.activeKey = keys
-    },
-    onSearch (value, panelIndex) {
-    console.log('搜索内容：', value, '面板索引：', panelIndex)
-    },
-  },
-  watch: {
-    queryParamsName: {
-      handler (newValue) {
-        this.getData(newValue, null)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped>
-.header-content {
-  display: flex;
-  align-items: center;
-  gap: 24px;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.header-text {
-  margin-right: 16px;
-  font-size: 16px;
-  font-weight: 800;
-  flex-shrink: 0;
-}
-
-.info-item {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  font-size: 12px;
-  color: #888888;
-  flex-shrink: 0;
-}
-
-.time-item {
-  margin-left: auto;
-  text-align: right;
-  flex-shrink: 0;
-}
-
-/* 覆盖 ant-design-vue 的默认样式 */
-:deep(.ant-collapse-header) {
-  align-items: center !important;
-}
-
-:deep(.ant-collapse-header-text) {
-  flex: 1;
-}
-
-:deep(.ant-collapse-content > .ant-collapse-content-box) {
-  padding: 0;
-}
-
-:deep(.ant-card-body) {
-  padding: 8px;
-}
-.search-input {
-  margin-left: auto;
-  width: 100%;
-}
-</style>
+<template>
+  <div>
+    <a-collapse
+      :activeKey="activeKey"
+      @change="handleChange"
+    >
+      <a-collapse-panel
+        v-for="(panel, panelIndex) in config.showData"
+        :key="panelIndex.toString()"
+        :show-arrow="false"
+      >
+        <template #header>
+          <div class="header-content">
+            <span
+              class="header-text"
+              :style="config.titleStyle"
+            >
+              {{ panel.title }}
+            </span>
+            <!-- 当有 title2 数据时显示信息项 -->
+            <template v-if="panel.title2 && panel.title2.length">
+              <span
+                v-for="(item, headerIndex) in panel.title2"
+                :key="headerIndex"
+                class="info-item"
+                :style="config.title2Style"
+              >
+                <span>{{ item.key }}:</span>
+                <span>{{ item.value }}</span>
+              </span>
+            </template>
+            <!-- 当有 title3 数据时显示时间项 -->
+            <span
+              v-if="panel.title3"
+              class="time-item"
+              :style="config.title3Style"
+            >
+              {{ panel.title3 }}
+            </span>
+            <!-- 修改搜索框的显示条件 -->
+            <a-input-search
+              v-if="panel.search"
+              v-model="searchText[panelIndex]"
+              :placeholder="panel.searchPlace"
+              class="search-input"
+              @search="(value) => onSearch(value, panelIndex)"
+              @click.stop
+            />
+          </div>
+        </template>
+        <!-- 根据类型显示不同内容 -->
+        <template v-if="panel.type === 'picture'">
+          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
+        </template>
+        <template v-else-if="panel.type === 'cover'">
+          <x-report
+            :use-oss-for-img="false"
+            :config-name="panel.configName"
+            server-name="af-his"
+            :show-img-in-cell="true"
+            :display-only="true"
+            :edit-mode="false"
+            :show-save-button="false"
+            :no-padding="true"
+            :dont-format="true">
+          </x-report>
+        </template>
+      </a-collapse-panel>
+    </a-collapse>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XCollapse',
+  components: {
+    XReport
+  },
+  inject: ['getConfigByName', 'getComponentByName'],
+  data () {
+    return {
+      activeKey: [],
+      config: {},
+      configName: '',
+      searchText: {}
+    }
+  },
+  props: {
+    // json名
+    queryParamsName: {
+      type: Object,
+      default: 'openPrescriptionConfig'
+    },
+    parameter: {
+      type: Object,
+    }
+  },
+  created () {
+    this.searchTexts = {} // 初始化对象
+
+    this.getData(this.queryParamsName)
+    window.addEventListener('setItem', (e) => {
+      console.log('监听到sessionStorage的变化：', e)
+      if (e.key === 'klcf_id') {
+        this.newVal = sessionStorage.getItem('klcf_id')
+        // 进行业务处理
+        console.log('sessionStorage中的值发生了变化：', this.newVal)
+      }
+    })
+  },
+  beforeDestroy () {
+    window.removeEventListener('setItem', this.handleStorageChange)
+  },
+  methods: {
+    handleStorageChange (e) {
+      console.log('监听到sessionStorage的变化：', e)
+      if (e.key === 'klcf_id') {
+        this.newVal = sessionStorage.getItem('klcf_id')
+        // 进行业务处理
+        console.log('sessionStorage中的值发生了变化：', this.newVal)
+      }
+    },
+    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 => {
+          this.config.showData = result
+          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
+        })
+      })
+    },
+    refreshXCollapse () {
+      this.getData(this.queryParamsName)
+    },
+    handleChange (keys) {
+      this.activeKey = keys
+    },
+    onSearch (value, panelIndex) {
+    console.log('搜索内容：', value, '面板索引：', panelIndex)
+    },
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue, null)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.header-content {
+  display: flex;
+  align-items: center;
+  gap: 24px;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.header-text {
+  margin-right: 16px;
+  font-size: 16px;
+  font-weight: 800;
+  flex-shrink: 0;
+}
+
+.info-item {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 12px;
+  color: #888888;
+  flex-shrink: 0;
+}
+
+.time-item {
+  margin-left: auto;
+  text-align: right;
+  flex-shrink: 0;
+}
+
+/* 覆盖 ant-design-vue 的默认样式 */
+:deep(.ant-collapse-header) {
+  align-items: center !important;
+}
+
+:deep(.ant-collapse-header-text) {
+  flex: 1;
+}
+
+:deep(.ant-collapse-content > .ant-collapse-content-box) {
+  padding: 0;
+}
+
+:deep(.ant-card-body) {
+  padding: 8px;
+}
+.search-input {
+  margin-left: auto;
+  width: 100%;
+}
+</style>

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

@@ -110,7 +110,7 @@ export default {
     XSidebar: () => import('@vue2-client/base-client/components/his/XSidebar/XSidebar.vue'),
     XList: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
     XInput: () => import('@vue2-client/base-client/components/common/XInput/XInput.vue'),
-    XTimeline: () => import('@vue2-client/base-client/components/common/XTimeline/XTimeline.vue'),
+    XTimeLine: () => import('@vue2-client/base-client/components/common/XTimeline/XTimeline.vue'),
   },
   props: {
     // 每一行的配置

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

@@ -49,7 +49,7 @@ import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 // 设置 dayjs 为中文语言环境
 dayjs.locale('zh-cn')
 
-export default ({
+export default {
   name: 'XTimeline',
   components: {
   },
@@ -73,19 +73,7 @@ export default ({
     return {
       currentDate: this.modelValue, // 当前选中日期
       baseDate: dayjs().format('YYYY-MM-DD'), // 基准日期，默认今天，用于计算显示范围
-      config: {
-        // 基础配置
-        range: null, // 显示的天数范围，默认7天
-        dateFormat: null, // 日期显示格式
-        weekFormat: null, // 星期显示格式
-        // 按钮文字配置
-        prevWeekText: null,
-        nextWeekText: null,
-        prevDayText: null,
-        nextDayText: null,
-        // 周末高亮配置
-        highlightWeekend: true
-      },
+      config: null,
       disabledDates: [] // 禁用日期列表
     }
   },
@@ -280,7 +268,7 @@ export default ({
       this.$emit('next-week', this.baseDate)
     }
   }
-})
+}
 </script>
 
 <style scoped>