vue2-client 1.12.84 → 1.12.87

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', 'x-radio'].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','x-calendar'].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', 'x-radio'].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','x-calendar'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -71,6 +71,7 @@
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
                 :queryParamsName="cell.slotConfig"
                 :configName="cell.slotConfig"
+                @listClick="listClick"
                 :countVisible="false"
                 :env="env"
               />
@@ -111,7 +112,8 @@ 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')
+    XRadio: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
+    XCalendar: () => import('@vue2-client/base-client/components/common/XCalendar/XCalendar.vue')
   },
   props: {
     // 每一行的配置
@@ -201,17 +203,15 @@ export default {
     }
   },
   inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget'],
-  provide () {
-    return {
-      getComponentByName: this.getComponentByName
-    }
-  },
   methods: {
     getWindow,
     isMicroAppEnv,
     microDispatch,
     getMicroData,
     getRealKeyData,
+    listClick (data) {
+      this.$emit('listClick', data)
+    },
     calculateColSpan (cell) {
       return Array.isArray(cell)
         ? cell[0][0]?.colSpan * 2

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

@@ -31,9 +31,9 @@ export default {
   },
   methods: {
     async getData (config) {
-        runLogic(config, {}, 'af-his').then(res => {
-          this.data = res
-        })
+      runLogic(config, {}, 'af-his').then(res => {
+        this.data = res
+      })
     },
     handleClick (index) {
       this.$emit('listClick', this.data[index])

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

package/src/pages/ReportGrid/index.vue

@@ -1,76 +1,76 @@
-<template>
-  <div id="test" v-if="showReport">
-    <XReport
-      @updateImg="updateImg"
-      ref="main"
-      :use-oss-for-img="false"
-      config-name="outpatientWait"
-      server-name="af-his"
-      :show-img-in-cell="true"
-      :display-only="displayOnly"
-      :edit-mode="false"
-      :show-save-button="false"
-      :dont-format="true"/>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport'
-// eslint-disable-next-line no-unused-vars
-import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
-
-export default {
-  name: 'Example',
-  components: {
-    XReport
-  },
-  mounted () {
-    console.log(this.$route)
-  },
-  data () {
-    return {
-      test: {
-        title: {
-          type: 'titleKey',
-          value: 'f_type'
-        },
-        designMode: 'json',
-      },
-      total: 1,
-      registerMap: [],
-      displayOnly: true,
-      showReport: true
-    }
-  },
-  methods: {
-    updateImg (data) {
-      console.warn('demo', data)
-    },
-    testExport () {
-      this.showReport = false
-      this.displayOnly = true
-      this.$nextTick(() => {
-        this.showReport = true
-        setTimeout(() => {
-          exportHTMLNodeToPDF('123', '#test')
-          this.showReport = false
-          this.displayOnly = false
-          this.$nextTick(() => {
-            this.showReport = true
-          })
-        }, 500)
-      })
-    },
-    testSave () {
-      const result = []
-      this.registerMap.forEach(item => {
-        result.push(item.exportData())
-      })
-      console.warn('save', result)
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test" v-if="showReport">
+    <XReport
+      @updateImg="updateImg"
+      ref="main"
+      :use-oss-for-img="false"
+      config-name="outpatientWait"
+      server-name="af-his"
+      :show-img-in-cell="true"
+      :display-only="displayOnly"
+      :edit-mode="false"
+      :show-save-button="false"
+      :dont-format="true"/>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport'
+// eslint-disable-next-line no-unused-vars
+import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
+
+export default {
+  name: 'Example',
+  components: {
+    XReport
+  },
+  mounted () {
+    console.log(this.$route)
+  },
+  data () {
+    return {
+      test: {
+        title: {
+          type: 'titleKey',
+          value: 'f_type'
+        },
+        designMode: 'json',
+      },
+      total: 1,
+      registerMap: [],
+      displayOnly: true,
+      showReport: true
+    }
+  },
+  methods: {
+    updateImg (data) {
+      console.warn('demo', data)
+    },
+    testExport () {
+      this.showReport = false
+      this.displayOnly = true
+      this.$nextTick(() => {
+        this.showReport = true
+        setTimeout(() => {
+          exportHTMLNodeToPDF('123', '#test')
+          this.showReport = false
+          this.displayOnly = false
+          this.$nextTick(() => {
+            this.showReport = true
+          })
+        }, 500)
+      })
+    },
+    testSave () {
+      const result = []
+      this.registerMap.forEach(item => {
+        result.push(item.exportData())
+      })
+      console.warn('save', result)
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>