vue2-client 1.12.76 → 1.12.78

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

@@ -25,7 +25,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -60,7 +60,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -111,6 +111,7 @@ export default {
     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'),
+    XRadio: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue')
   },
   props: {
     // 每一行的配置

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

@@ -62,7 +62,7 @@ export default {
     // 配置参数名称，用于获取时间轴配置
     queryParamsName: {
       type: String,
-      default: 'XTimelineExampleConfig'
+      default: ''
     }
   },
 
@@ -121,49 +121,20 @@ export default {
     // 获取时间轴配置数据
     async getData (data) {
       getConfigByName(data, 'af-his', res => {
-        // var res = {
-        //   // 基础配置
-        //   range: 7, // 显示的天数范围，默认7天
-        //   defaultValue: '', // 默认选中日期，不设置则默认今天
-        //   // 日期格式化
-        //   dateFormat: 'MM/DD', // 日期显示格式，如 03/21
-        //   weekFormat: '周dd', // 星期显示格式，如 周四
-        //   // 按钮文字配置
-        //   prevWeekText: '前一周', // 上一周按钮文字
-        //   nextWeekText: '后一周', // 下一周按钮文字
-        //   prevDayText: '前一天', // 前一天按钮文字
-        //   nextDayText: '后一天', // 后一天按钮文字
-        //   // 日期范围限制
-        //   minDate: '2024-01-01', // 最小可选日期
-        //   maxDate: '2025-12-31', // 最大可选日期
-        //   // 周末高亮配置
-        //   highlightWeekend: true, // 是否高亮周末
-        //   // 业务逻辑配置
-        //   logicName: 'getDisabledDates', // 获取禁用日期的逻辑名称
-        //   parameter: {
-        //     userId: 'xxx',
-        //     type: 'workday'
-        //   }
-        // }
         this.config = res
         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')
         }
 
         // 执行配置中指定的业务逻辑
         if (res.logicName) {
            runLogic(res.logicName, res.parameter, 'af-his').then(result => {
-          // var result = {
-          //   disabledDates: [ // 禁用的日期列表
-          //     '2025-03-23', // 周六
-          //     '2025-03-24', // 周日
-          //     '2025-03-25' // 其他需要禁用的日期
-          //   ],
-          //   currentDate: '' // 指定当前选中日期（可选）
-          // }
             if (result) {
               this.handleLogicResult(result)
             }

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">
+      <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

@@ -0,0 +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>

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

@@ -47,7 +47,7 @@ export default {
   },
   data () {
     return {
-      isOpen: true,
+      isOpen: false,
       // 定义主内容区域的最大和最小宽度百分比
       mainWithData: [{ max: 80, min: 56 }]
     }

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