vue2-client 1.9.16 → 1.9.18

package/.env.his

@@ -0,0 +1,19 @@
+VUE_APP_PUBLIC_PATH=/
+VUE_APP_NAME=Admin
+VUE_APP_ROUTES_KEY=admin.routes
+VUE_APP_PERMISSIONS_KEY=admin.permissions
+VUE_APP_ROLES_KEY=admin.roles
+VUE_APP_USER_KEY=admin.user
+VUE_APP_LOGIN_KEY=admin.login
+VUE_APP_SETTING_KEY=admin.setting
+VUE_APP_TBAS_KEY=admin.tabs
+VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
+VUE_APP_DICTIONARY_KEY=admin.dictionary
+VUE_APP_BADGE_KEY=admin.badge
+VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
+VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
+VUE_APP_WEB_CONFIG_KEY=admin.webconfig
+VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_SYSTEM_NAME=af-his
+VUE_APP_LOGIN_VERSION=V4
+

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "vue2-client",
-  "version": "1.9.16",
+  "version": "1.9.18",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
     "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
     "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
     "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
     "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",

package/src/base-client/components/common/XAddNativeForm/demo.vue

@@ -0,0 +1,25 @@
+<script>
+import XAddNativeForm from '@/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByNameAsync } from '@/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XAddNativeForm },
+  created () {
+    getConfigByNameAsync('patientInfoQueryForm', 'af-his').then(res => {
+      this.$refs.xAddFrom.init(res)
+    })
+  },
+  methods: {}
+}
+</script>
+
+<template>
+  <a-card>
+    <x-add-native-form ref="xAddFrom"/>
+  </a-card>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -120,6 +120,9 @@ export default {
     },
     getSelectedId () {
       if (typeof this.selectedId === 'object') {
+        if (this.selectedId.selectedId) {
+          return this.selectedId.selectedId
+        }
         if (Object.keys(this.selectedId) > 0) {
           return this.selectedId[Object.keys(this.selectedId)[0]]
         }

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -59,11 +59,17 @@
               <span class="custom-tree-node" slot-scope="{ node,data }">
                 <span :class="{ 'selected': data === selectedNode }" @click="nodeItemClick(data)">
                   <a-tooltip placement="right" :title="node.label">
-                    <span
-                      v-html="highlightKeyword(node.label, searchInput)"></span>
-                    <span v-if="countVisible">{{
-                      data.hasOwnProperty('count') ? ' (' + data.count + ')' : ''
-                    }}</span>
+                    <a-space>
+                      <a-icon
+                        v-if="data.icon"
+                        :style="{color: data.iconColor}"
+                        :type="data.icon"/>
+                      <span
+                        v-html="highlightKeyword(node.label, searchInput)"></span>
+                      <span v-if="countVisible">{{
+                        data.hasOwnProperty('count') ? ' (' + data.count + ')' : ''
+                      }}</span>
+                    </a-space>
                   </a-tooltip>
                 </span>
                 <a-space style="float:right;margin-right: .2rem">

package/src/router/async/router.map.js

@@ -83,7 +83,8 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {