vue2-client 1.12.78 → 1.12.80

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

@@ -908,21 +908,22 @@ export default {
       this.innerSelectedRows = selectedRows
       if (this.selectRowMode === 'listView' && !this.clearSelectRowAfterQuery) {
         if (this.primaryKey) {
-          // 使用主键去重合并选中的行
-          const uniqueKeys = [...new Set([...this.selectedRowKeys, ...this.innerSelectedRowKeys])]
-          this.selectedRowKeys = uniqueKeys
-          // 使用主键去重合并选中的行数据
-          const uniqueRows = [...this.selectedRows, ...this.innerSelectedRows].reduce((acc, current) => {
-            const x = acc.find(item => item[this.primaryKey] === current[this.primaryKey])
-            if (!x) {
-              return acc.concat([current])
-            }
-            return acc
-          }, [])
-          this.selectedRows = uniqueRows
+          // 找出被取消选中的行
+          const deselectedKeys = this.selectedRowKeys.filter(key => !selectedRowKeys.includes(key))
+          // 从已选中的行中移除被取消选中的行
+          if (deselectedKeys.length > 0) {
+            this.selectedRowKeys = this.selectedRowKeys.filter(key => !deselectedKeys.includes(key))
+            this.selectedRows = this.selectedRows.filter(row => !deselectedKeys.includes(row[this.primaryKey]))
+          }
+          // 添加新选中的行（去重）
+          const newSelectedKeys = selectedRowKeys.filter(key => !this.selectedRowKeys.includes(key))
+          const newSelectedRows = selectedRows.filter(row => newSelectedKeys.includes(row[this.primaryKey]))
+          this.selectedRowKeys = [...this.selectedRowKeys, ...newSelectedKeys]
+          this.selectedRows = [...this.selectedRows, ...newSelectedRows]
         } else {
-          this.selectedRowKeys = this.selectedRowKeys.concat(this.innerSelectedRowKeys)
-          this.selectedRows = this.selectedRows.concat(this.innerSelectedRows)
+          // 如果没有主键，则直接使用当前选中的行
+          this.selectedRowKeys = selectedRowKeys
+          this.selectedRows = selectedRows
         }
       } else {
         this.selectedRowKeys = this.innerSelectedRowKeys
@@ -931,7 +932,7 @@ export default {
       this.isModify = this.innerSelectedRowKeys.length === 1
       this.isDelete = this.innerSelectedRowKeys.length > 0
       this.isChoose = this.allowSelectRowNum === 0 ? this.innerSelectedRowKeys.length > 0 : this.innerSelectedRowKeys.length === this.allowSelectRowNum
-      this.$emit('selectRow', selectedRowKeys, selectedRows)
+      this.$emit('selectRow', this.selectedRowKeys, this.selectedRows)
     },
     /**
      * 清除表格选中项

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

@@ -67,7 +67,7 @@ export default {
   },
 
   // 定义组件事件
-  emits: ['update:modelValue', 'change', 'prev-week', 'next-week', 'prev-day', 'next-day'],
+  emits: ['update:modelValue', 'change', 'prev-week', 'next-week', 'prev-day', 'next-day', 'init'],
 
   data () {
     return {
@@ -122,14 +122,13 @@ export default {
     async getData (data) {
       getConfigByName(data, 'af-his', res => {
         this.config = res
+        // 触发初始化事件，传递配置和默认日期
+        this.$emit('init', this.baseDate)
         if (res.defaultValue) {
           // 如果有默认值，则设置当前选中日期和基准日期
           this.currentDate = res.defaultValue
           this.baseDate = res.defaultValue
           this.$emit('update:modelValue', res.defaultValue)
-        } else {
-          // 如果没有默认值，则设置当前选中日期为今天
-          this.currentDate = dayjs().format('YYYY-MM-DD')
         }
 
         // 执行配置中指定的业务逻辑

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

@@ -1,90 +1,90 @@
-<template>
-  <div class="list-wrapper" >
-    <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container">
-      <a-list-item slot="renderItem" slot-scope="item, index" class="list-item" @click="handleClick(index)">
-        {{ item.number }} {{ item.name }}
-      </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: 'outpatientWaitLogic'
-    },
-  },
-  inject: ['getComponentByName'],
-  data () {
-    return {
-      data: []
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    async getData (config) {
-        runLogic(config, {}, 'af-his').then(res => {
-          this.data = res
-        })
-    },
-    handleClick (index) {
-      this.$emit('listClick', this.data[index])
-    },
-    refreshList () {
-      this.getData(this.queryParamsName)
-    },
-
-  }
-}
-</script>
-
-<style scoped>
-.list-wrapper {
-  max-height: 240px;
-  overflow-y: auto;
-  cursor: pointer;
-  padding-right: 2px;
-}
-
-.list-container {
-  width: 100%;
-}
-
-.list-item {
-  height: 35px;
-  border-radius: 6px;
-  background-color: #F4F4F4;
-  padding: 8px 15px 7px 15px;
-  font-size: 16px;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  border: 1px solid #D9D9D9;
-  box-sizing: border-box;
-  margin-bottom: 16px;
-  white-space: nowrap;
-  overflow: clip;
-}
-
-/* 自定义滚动条样式 */
-.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)">
+        {{ item.number }} {{ item.name }}
+      </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: 'outpatientWaitLogic'
+    },
+  },
+  inject: ['getComponentByName'],
+  data () {
+    return {
+      data: []
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+        runLogic(config, {}, 'af-his').then(res => {
+          this.data = res
+        })
+    },
+    handleClick (index) {
+      this.$emit('listClick', this.data[index])
+    },
+    refreshList () {
+      this.getData(this.queryParamsName)
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+.list-wrapper {
+  max-height: 240px;
+  overflow-y: auto;
+  cursor: pointer;
+  padding-right: 2px;
+}
+
+.list-container {
+  width: 100%;
+}
+
+.list-item {
+  height: 35px;
+  border-radius: 6px;
+  background-color: #F4F4F4;
+  padding: 8px 15px 7px 15px;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  border: 1px solid #D9D9D9;
+  box-sizing: border-box;
+  margin-bottom: 16px;
+  white-space: nowrap;
+  overflow: clip;
+}
+
+/* 自定义滚动条样式 */
+.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/XRadio/XRadio.vue

@@ -1,50 +1,50 @@
-<template>
-  <div>
-    <a-radio-group v-model="innerValue" @change="onChange">
-      <a-radio v-for="item in data" :key="item.value" :value="item.value">
-        {{ item.label }}
-      </a-radio>
-    </a-radio-group>
-  </div>
-</template>
-
-<script>
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XRadio',
-  inject: ['getComponentByName'],
-  props: {
-    queryParamsName: {
-      type: Object,
-      default: null
-    },
-    value: [String, Number]
-  },
-  data () {
-    return {
-      data: [],
-      innerValue: null
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  watch: {
-    value (val) {
-      this.innerValue = val
-    }
-  },
-  methods: {
-    async getData (data) {
-      getConfigByName(data, 'af-his', res => {
-        console.warn(res.radio)
-        this.data = res.radio
-      })
-    },
-    onChange (e) {
-      this.$emit('radio', e.target.value)
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <a-radio-group v-model="innerValue" @change="onChange">
+      <a-radio v-for="item in data" :key="item.value" :value="item.value">
+        {{ item.label }}
+      </a-radio>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XRadio',
+  inject: ['getComponentByName'],
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    },
+    value: [String, Number]
+  },
+  data () {
+    return {
+      data: [],
+      innerValue: null
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  watch: {
+    value (val) {
+      this.innerValue = val
+    }
+  },
+  methods: {
+    async getData (data) {
+      getConfigByName(data, 'af-his', res => {
+        console.warn(res.radio)
+        this.data = res.radio
+      })
+    },
+    onChange (e) {
+      this.$emit('radio', e.target.value)
+    }
+  }
+}
+</script>

package/src/base-client/plugins/AppData.js

@@ -1,126 +1,126 @@
-import { manageApi, post } from '@vue2-client/services/api'
-import { handleTree } from '@vue2-client/utils/util'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-const GetAppDataService = {
-  install (Vue) {
-    // 给vue增添对话框显示方法
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-  async load () {
-    const params = {}
-    await post(manageApi.getDictionaryValue, {}).then((res) => {
-      Object.assign(params, res)
-      const badgeItemArray = {}
-      for (const key of Object.keys(params)) {
-        badgeItemArray[key] = {}
-        for (const item of params[key]) {
-          let status
-          if (!item.status) {
-            status = 'none'
-          } else {
-            status = item.status
-          }
-          badgeItemArray[key][item.value] = {
-            status: status,
-            text: item.text
-          }
-        }
-      }
-      // 追加参数
-      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
-      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
-    })
-  },
-  // 返回树形省市区
-  async getDivisionsOhChinaForTree () {
-    // 获取省市区数据
-    return new Promise((resolve, reject) => {
-      try {
-        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, res => {
-          resolve(res)
-        }, processRes => {
-          return handleTree(processRes, 'code', 'parentcode')
-        })
-      } catch (e) {
-        reject(e)
-      }
-    })
-  },
-  // 旧版获取配置中心字典
-  getDictionaryList (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-  async getDictValue (dictKey, value, func, isDev = false, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-    const processResult = (result) => {
-      if (!result.value) {
-        return {
-          status: 'none',
-          text: value
-        }
-      }
-      const item = result.value.find(item => item.value == value)
-      if (item) {
-        return {
-          status: item.status || 'none',
-          text: item.label
-        }
-      }
-      return {
-        status: 'none',
-        text: value
-      }
-    }
-    if (func) {
-      getConfigByName(dictKey, serviceName, result => {
-        func(processResult(result))
-      }, isDev)
-    } else {
-      const result = await new Promise((resolve) => {
-        getConfigByName(dictKey, serviceName, resolve, isDev)
-      })
-      return processResult(result)
-    }
-  },
-  // 新版获取配置中心字典推荐使用 服务名默认为当前服务
-  getDictByKey (dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
-    getConfigByName(dictKey, undefined, result => {
-      callback(result.value)
-    }, isDev)
-  },
-  getParam (key, value, callback) {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    if (object && object[key]) {
-      const result = object[key]
-      if (Object.prototype.hasOwnProperty.call(result, value)) {
-        return result[value]
-      } else {
-        return { status: 'none', text: value }
-      }
-    }
-    return null
-  },
-  getParams () {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    return JSON.parse(str)
-  },
-  getSingleValues () {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    return JSON.parse(str)
-  },
-  getWebConfigByKey (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-  getStylesByKey (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_WEB_STYLES_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-}
-export default GetAppDataService
+import { manageApi, post } from '@vue2-client/services/api'
+import { handleTree } from '@vue2-client/utils/util'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+const GetAppDataService = {
+  install (Vue) {
+    // 给vue增添对话框显示方法
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+  async load () {
+    const params = {}
+    await post(manageApi.getDictionaryValue, {}).then((res) => {
+      Object.assign(params, res)
+      const badgeItemArray = {}
+      for (const key of Object.keys(params)) {
+        badgeItemArray[key] = {}
+        for (const item of params[key]) {
+          let status
+          if (!item.status) {
+            status = 'none'
+          } else {
+            status = item.status
+          }
+          badgeItemArray[key][item.value] = {
+            status: status,
+            text: item.text
+          }
+        }
+      }
+      // 追加参数
+      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
+      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
+    })
+  },
+  // 返回树形省市区
+  async getDivisionsOhChinaForTree () {
+    // 获取省市区数据
+    return new Promise((resolve, reject) => {
+      try {
+        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, res => {
+          resolve(res)
+        }, processRes => {
+          return handleTree(processRes, 'code', 'parentcode')
+        })
+      } catch (e) {
+        reject(e)
+      }
+    })
+  },
+  // 旧版获取配置中心字典
+  getDictionaryList (key) {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object[key]
+  },
+  async getDictValue (dictKey, value, func, isDev = false, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
+    const processResult = (result) => {
+      if (!result.value) {
+        return {
+          status: 'none',
+          text: value
+        }
+      }
+      const item = result.value.find(item => item.value == value)
+      if (item) {
+        return {
+          status: item.status || 'none',
+          text: item.label
+        }
+      }
+      return {
+        status: 'none',
+        text: value
+      }
+    }
+    if (func) {
+      getConfigByName(dictKey, serviceName, result => {
+        func(processResult(result))
+      }, isDev)
+    } else {
+      const result = await new Promise((resolve) => {
+        getConfigByName(dictKey, serviceName, resolve, isDev)
+      })
+      return processResult(result)
+    }
+  },
+  // 新版获取配置中心字典推荐使用 服务名默认为当前服务
+  getDictByKey (dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
+    getConfigByName(dictKey, undefined, result => {
+      callback(result.value)
+    }, isDev)
+  },
+  getParam (key, value, callback) {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    if (object && object[key]) {
+      const result = object[key]
+      if (Object.prototype.hasOwnProperty.call(result, value)) {
+        return result[value]
+      } else {
+        return { status: 'none', text: value }
+      }
+    }
+    return null
+  },
+  getParams () {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    return JSON.parse(str)
+  },
+  getSingleValues () {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    return JSON.parse(str)
+  },
+  getWebConfigByKey (key) {
+    const str = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
+    const object = JSON.parse(str)
+    return object[key]
+  },
+  getStylesByKey (key) {
+    const str = localStorage.getItem(process.env.VUE_APP_WEB_STYLES_KEY)
+    const object = JSON.parse(str)
+    return object[key]
+  },
+}
+export default GetAppDataService