vue2-client 1.12.101 → 1.12.103

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

@@ -43,6 +43,12 @@ export default {
     queryParamsName: {
       type: String,
       default: 'DescriptionsExampleConfig'
+    },
+    parameter: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   created () {
@@ -54,7 +60,8 @@ export default {
       getConfigByName(data, 'af-his', res => {
         this.configurationParameters = res
         console.log(this.configurationParameters)
-        runLogic(res.logicName, res.parameter, 'af-his').then(result => {
+        const parameter = { ...res.parameter, ...this.parameter }
+        runLogic(res.logicName, parameter, 'af-his').then(result => {
           this.data = result
         })
       })

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

@@ -1,131 +1,131 @@
-<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)">
-        <i
-          v-if="icon"
-          class="icon-menu"
-          :style="getIconStyle(item)"
-        ></i>
-        <span
-          class="item-text">
-          {{ item.number }} {{ item.name }}
-        </span>
-        <a-button v-if="button" type="link" class="confirm-btn" @click.stop="click(index)">{{ buttonName }}</a-button>
-      </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: null
-    }
-  },
-  inject: ['getComponentByName'],
-  data () {
-    return {
-      data: [],
-      button: false,
-      icon: false,
-      buttonName: ''
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    async getData (config) {
-        runLogic(config, {}, 'af-his').then(res => {
-          this.button = res.button
-          this.icon = res.icon
-          this.buttonName = res.buttonName
-          this.data = res.data
-        })
-    },
-    handleClick (index) {
-      this.$emit('listClick', this.data[index])
-    },
-    refreshList () {
-      this.getData(this.queryParamsName)
-    },
-    click (index) {
-      this.$emit('click', this.data[index])
-    },
-    getIconStyle (item) {
-      return item.picture
-        ? { backgroundImage: `url(${item.picture})` }
-        : {}
-    },
-    filterData (par) {
-      runLogic(this.queryParamsName, par, 'af-his').then(res => {
-        this.data = res.data
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.list-wrapper {
-  max-height: 240px;
-  overflow-y: auto;
-  padding-right: 2px;
-}
-
-.list-container {
-  width: 100%;
-}
-
-.list-item {
-  height: 35px;
-  border-radius: 6px;
-  background-color: #F4F4F4;
-  padding: 8px 15px;
-  font-size: 16px;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  border: 1px solid #D9D9D9;
-  box-sizing: border-box;
-  margin-bottom: 8px !important;
-}
-
-.icon-menu {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  background-color: #ccc;
-  margin-right: 8px;
-}
-
-.item-text {
-  flex: 1;
-}
-
-.confirm-btn {
-  margin-left: auto;
-  padding: 0 8px;
-}
-
-/* 自定义滚动条样式 */
-.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)">
+        <i
+          v-if="icon"
+          class="icon-menu"
+          :style="getIconStyle(item)"
+        ></i>
+        <span
+          class="item-text">
+          {{ item.number }} {{ item.name }}
+        </span>
+        <a-button v-if="button" type="link" class="confirm-btn" @click.stop="click(index)">{{ buttonName }}</a-button>
+      </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: null
+    }
+  },
+  inject: ['getComponentByName'],
+  data () {
+    return {
+      data: [],
+      button: false,
+      icon: false,
+      buttonName: ''
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+        runLogic(config, {}, 'af-his').then(res => {
+          this.button = res.button
+          this.icon = res.icon
+          this.buttonName = res.buttonName
+          this.data = res.data
+        })
+    },
+    handleClick (index) {
+      this.$emit('listClick', this.data[index])
+    },
+    refreshList () {
+      this.getData(this.queryParamsName)
+    },
+    click (index) {
+      this.$emit('click', this.data[index])
+    },
+    getIconStyle (item) {
+      return item.picture
+        ? { backgroundImage: `url(${item.picture})` }
+        : {}
+    },
+    filterData (par) {
+      runLogic(this.queryParamsName, par, 'af-his').then(res => {
+        this.data = res.data
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.list-wrapper {
+  max-height: 240px;
+  overflow-y: auto;
+  padding-right: 2px;
+}
+
+.list-container {
+  width: 100%;
+}
+
+.list-item {
+  height: 35px;
+  border-radius: 6px;
+  background-color: #F4F4F4;
+  padding: 8px 15px;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  border: 1px solid #D9D9D9;
+  box-sizing: border-box;
+  margin-bottom: 8px !important;
+}
+
+.icon-menu {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  background-color: #ccc;
+  margin-right: 8px;
+}
+
+.item-text {
+  flex: 1;
+}
+
+.confirm-btn {
+  margin-left: auto;
+  padding: 0 8px;
+}
+
+/* 自定义滚动条样式 */
+.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/XSidebar/XSidebar.vue

@@ -127,14 +127,14 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              //  更新当前列的宽度
+              // 更新当前列的宽度
               const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
             max-width: ${drawerWidth}% !important;
             transition: all 0.3s;`
-              //  触发XTab组件重新计算宽度
+              // 触发XTab组件重新计算宽度
               this.$nextTick(() => {
                 const tabComponent = this.$el.querySelector('.ant-tabs')
                 if (tabComponent) {
@@ -142,7 +142,7 @@ export default {
                   window.dispatchEvent(new Event('resize'))
                 }
               })
-              //  更新其他列宽度
+              // 更新其他列宽度
               otherCols.forEach((col, index) => {
                 if (index < this.mainWithData.length) {
                   const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max

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

@@ -0,0 +1,39 @@
+<template>
+    <div class="x-title">{{ title }}</div>
+</template>
+
+<script>
+export default {
+    name: 'XTitle',
+    props: {
+      queryParamsName: {
+        type: String,
+        default: null
+      }
+    },
+    data () {
+      return {
+        title: ''
+      }
+    },
+    created () {
+      this.getData(this.queryParamsName)
+    },
+    methods: {
+        getData (data) {
+            this.title = data
+        }
+    }
+  }
+</script>
+<style scoped>
+.x-title {
+    font-size: 18px;
+    font-weight: bold;
+    height: 26px;
+    width: 100%;
+    text-align: left;
+    font-family: "Source Han Sans", sans-serif;
+    color: #5D5C5C;
+}
+</style>

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