vue2-client 1.12.98 → 1.12.100

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

@@ -1,251 +1,251 @@
-<template>
-  <div>
-    <a-collapse
-      :activeKey="activeKey"
-      @change="handleChange"
-    >
-      <a-collapse-panel
-        v-for="(panel, panelIndex) in config.showData"
-        :key="panelIndex.toString()"
-        :show-arrow="false"
-        :disabled="config.collapsible"
-      >
-        <template #header>
-          <div class="header-content">
-            <span
-              class="header-text"
-              :style="config.titleStyle"
-            >
-              {{ panel.title }}
-            </span>
-            <!-- 当有 title2 数据时显示信息项 -->
-            <template v-if="panel.title2 && panel.title2.length">
-              <span
-                v-for="(item, headerIndex) in panel.title2"
-                :key="headerIndex"
-                class="info-item"
-                :style="config.title2Style"
-              >
-                <!-- 根据showTitle是否显示键名 -->
-                <span v-if="item.showTitle">{{ item.key }}:</span>
-                <span>{{ item.value }}</span>
-              </span>
-            </template>
-            <!-- 当有 title3 数据时显示时间项 -->
-            <span
-              v-if="panel.title3"
-              class="time-item"
-              :style="config.title3Style"
-            >
-              {{ panel.title3 }}
-            </span>
-            <!-- 修改搜索框的显示条件 -->
-            <a-input-search
-              v-if="panel.search"
-              v-model="searchText[panelIndex]"
-              :placeholder="panel.searchPlace"
-              class="search-input"
-              @search="(value) => onSearch(value, panelIndex)"
-              @click.stop
-            />
-          </div>
-        </template>
-        <!-- 根据类型显示不同内容 -->
-        <template v-if="panel.type === 'picture'">
-          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
-        </template>
-        <template v-else-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(panel.type)">
-          <component
-            :is="getComponentName(panel.type)"
-            :ref="`dynamicComponent_${ panel.type }`"
-            serverName="af-his"
-            :queryParamsName="panel.configName"
-            :countVisible="false"
-            :env="env"
-            @listClick="listClick"
-            @click="click"
-          />
-        </template>
-      </a-collapse-panel>
-    </a-collapse>
-  </div>
-</template>
-
-<script>
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XCollapse',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'),
-    XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
-    XFormGroup: () => import('@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'),
-    XTreePro: () => import('@vue2-client/base-client/components/common/XTree/XTreePro.vue'),
-    XHisEditor: () => import('@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'),
-    XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue'),
-    XReport: () => import('@vue2-client/base-client/components/common/XReport/XReport.vue'),
-    XButtons: () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue'),
-    XLabelSelect: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'),
-    XConversation: () => import('@vue2-client/base-client/components/common/XConversation/XConversation.vue'),
-    XCheckList: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
-    XCardSet: () => import('@vue2-client/base-client/components/common/XCardSet/XCardSet.vue'),
-    XCollapse: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
-    XHDescriptions: () => import('@vue2-client/base-client/components/his/XHDescriptions/XHDescriptions.vue'),
-    XSidebar: () => import('@vue2-client/base-client/components/his/XSidebar/XSidebar.vue'),
-    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')
-  },
-  data () {
-    return {
-      activeKey: [],
-      config: {},
-      configName: '',
-      searchText: {}
-    }
-  },
-  props: {
-    // 环境
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    // json名
-    queryParamsName: {
-      type: Object,
-      default: null
-    },
-    parameter: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName, this.parameter)
-  },
-  beforeDestroy () {
-  },
-  methods: {
-    getComponentName (componentName) {
-      return componentName
-    },
-    listClick (data) {
-      this.$emit('listClick', data)
-    },
-    click (data) {
-      this.$emit('click', data)
-    },
-    getConfigByName (componentName) {
-      const refKey = `dynamicComponent_${componentName}`
-      return this.$refs[refKey]
-    },
-    async getData (config, parameter) {
-      this.configName = config
-      getConfigByName(config, 'af-his', res => {
-        this.config = res
-        console.warn(this.config)
-        runLogic(res.mainLogic, parameter, 'af-his').then(result => {
-          this.config.showData = result
-          // 更具timeType更改时间类型
-          if (this.config.timeType && this.config.timeType === '.') {
-            this.config.showData.forEach(panel => {
-              if (panel.title3) {
-                panel.title3 = this.convertToCustomFormat(panel.title3)
-              }
-            })
-            this.$forceUpdate()
-          }
-          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
-        })
-      })
-    },
-    refreshXCollapse () {
-      this.getData(this.queryParamsName, this.parameter)
-    },
-    convertToCustomFormat (dateString) {
-      // 创建一个新的 Date 对象
-      const date = new Date(dateString)
-      // 获取年、月、日
-      const year = date.getFullYear()
-      const month = date.getMonth() + 1 // 月份从0开始，所以需要加1
-      const day = date.getDate()
-      // 返回格式化后的字符串
-      return `${year}.${month}.${day}`
-    },
-    handleChange (keys) {
-      this.activeKey = keys
-    },
-    onSearch (value, panelIndex) {
-      this.$emit('searchChange', { value: value, panelIndex: panelIndex })
-    },
-  },
-  watch: {
-    queryParamsName: {
-      handler (newValue) {
-        this.getData(newValue, this.parameter)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped>
-.header-content {
-  display: flex;
-  align-items: center;
-  gap: 24px;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.header-text {
-  margin-right: 16px;
-  font-size: 16px;
-  font-weight: 800;
-  flex-shrink: 0;
-}
-
-.info-item {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  font-size: 12px;
-  color: #888888;
-  flex-shrink: 0;
-}
-
-.time-item {
-  margin-left: auto;
-  text-align: right;
-  flex-shrink: 0;
-}
-
-:deep(.ant-collapse-header) {
-  position: relative;
-  border-bottom: v-bind('config.showLine ? "1px solid #000000" : "none"');
-  align-items: center !important;
-}
-
-:deep(.ant-collapse-header-text) {
-  flex: 1;
-}
-
-:deep(.ant-collapse-content > .ant-collapse-content-box) {
-  padding: 0;
-}
-
-:deep(.ant-card-body) {
-  padding: 8px;
-}
-.search-input {
-  margin-left: auto;
-  width: 100%;
-}
-:deep(.ant-collapse-item-disabled > .ant-collapse-header) {
-  cursor: default !important;
-}
-</style>
+<template>
+  <div>
+    <a-collapse
+      :activeKey="activeKey"
+      @change="handleChange"
+    >
+      <a-collapse-panel
+        v-for="(panel, panelIndex) in config.showData"
+        :key="panelIndex.toString()"
+        :show-arrow="false"
+        :disabled="config.collapsible"
+      >
+        <template #header>
+          <div class="header-content">
+            <span
+              class="header-text"
+              :style="config.titleStyle"
+            >
+              {{ panel.title }}
+            </span>
+            <!-- 当有 title2 数据时显示信息项 -->
+            <template v-if="panel.title2 && panel.title2.length">
+              <span
+                v-for="(item, headerIndex) in panel.title2"
+                :key="headerIndex"
+                class="info-item"
+                :style="config.title2Style"
+              >
+                <!-- 根据showTitle是否显示键名 -->
+                <span v-if="item.showTitle">{{ item.key }}:</span>
+                <span>{{ item.value }}</span>
+              </span>
+            </template>
+            <!-- 当有 title3 数据时显示时间项 -->
+            <span
+              v-if="panel.title3"
+              class="time-item"
+              :style="config.title3Style"
+            >
+              {{ panel.title3 }}
+            </span>
+            <!-- 修改搜索框的显示条件 -->
+            <a-input-search
+              v-if="panel.search"
+              v-model="searchText[panelIndex]"
+              :placeholder="panel.searchPlace"
+              class="search-input"
+              @search="(value) => onSearch(value, panelIndex)"
+              @click.stop
+            />
+          </div>
+        </template>
+        <!-- 根据类型显示不同内容 -->
+        <template v-if="panel.type === 'picture'">
+          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
+        </template>
+        <template v-else-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(panel.type)">
+          <component
+            :is="getComponentName(panel.type)"
+            :ref="`dynamicComponent_${ panel.type }`"
+            serverName="af-his"
+            :queryParamsName="panel.configName"
+            :countVisible="false"
+            :env="env"
+            @listClick="listClick"
+            @click="click"
+          />
+        </template>
+      </a-collapse-panel>
+    </a-collapse>
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XCollapse',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'),
+    XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
+    XFormGroup: () => import('@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'),
+    XTreePro: () => import('@vue2-client/base-client/components/common/XTree/XTreePro.vue'),
+    XHisEditor: () => import('@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'),
+    XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue'),
+    XReport: () => import('@vue2-client/base-client/components/common/XReport/XReport.vue'),
+    XButtons: () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue'),
+    XLabelSelect: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'),
+    XConversation: () => import('@vue2-client/base-client/components/common/XConversation/XConversation.vue'),
+    XCheckList: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
+    XCardSet: () => import('@vue2-client/base-client/components/common/XCardSet/XCardSet.vue'),
+    XCollapse: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
+    XHDescriptions: () => import('@vue2-client/base-client/components/his/XHDescriptions/XHDescriptions.vue'),
+    XSidebar: () => import('@vue2-client/base-client/components/his/XSidebar/XSidebar.vue'),
+    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')
+  },
+  data () {
+    return {
+      activeKey: [],
+      config: {},
+      configName: '',
+      searchText: {}
+    }
+  },
+  props: {
+    // 环境
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    // json名
+    queryParamsName: {
+      type: Object,
+      default: null
+    },
+    parameter: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName, this.parameter)
+  },
+  beforeDestroy () {
+  },
+  methods: {
+    getComponentName (componentName) {
+      return componentName
+    },
+    listClick (data) {
+      this.$emit('listClick', data)
+    },
+    click (data) {
+      this.$emit('click', data)
+    },
+    getConfigByName (componentName) {
+      const refKey = `dynamicComponent_${componentName}`
+      return this.$refs[refKey]
+    },
+    async getData (config, parameter) {
+      this.configName = config
+      getConfigByName(config, 'af-his', res => {
+        this.config = res
+        console.warn(this.config)
+        runLogic(res.mainLogic, parameter, 'af-his').then(result => {
+          this.config.showData = result
+          // 更具timeType更改时间类型
+          if (this.config.timeType && this.config.timeType === '.') {
+            this.config.showData.forEach(panel => {
+              if (panel.title3) {
+                panel.title3 = this.convertToCustomFormat(panel.title3)
+              }
+            })
+            this.$forceUpdate()
+          }
+          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
+        })
+      })
+    },
+    refreshXCollapse () {
+      this.getData(this.queryParamsName, this.parameter)
+    },
+    convertToCustomFormat (dateString) {
+      // 创建一个新的 Date 对象
+      const date = new Date(dateString)
+      // 获取年、月、日
+      const year = date.getFullYear()
+      const month = date.getMonth() + 1 // 月份从0开始，所以需要加1
+      const day = date.getDate()
+      // 返回格式化后的字符串
+      return `${year}.${month}.${day}`
+    },
+    handleChange (keys) {
+      this.activeKey = keys
+    },
+    onSearch (value, panelIndex) {
+      this.$emit('searchChange', { value: value, panelIndex: panelIndex })
+    },
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue, this.parameter)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.header-content {
+  display: flex;
+  align-items: center;
+  gap: 24px;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.header-text {
+  margin-right: 16px;
+  font-size: 16px;
+  font-weight: 800;
+  flex-shrink: 0;
+}
+
+.info-item {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 12px;
+  color: #888888;
+  flex-shrink: 0;
+}
+
+.time-item {
+  margin-left: auto;
+  text-align: right;
+  flex-shrink: 0;
+}
+
+:deep(.ant-collapse-header) {
+  position: relative;
+  border-bottom: v-bind('config.showLine ? "1px solid #000000" : "none"');
+  align-items: center !important;
+}
+
+:deep(.ant-collapse-header-text) {
+  flex: 1;
+}
+
+:deep(.ant-collapse-content > .ant-collapse-content-box) {
+  padding: 0;
+}
+
+:deep(.ant-card-body) {
+  padding: 8px;
+}
+.search-input {
+  margin-left: auto;
+  width: 100%;
+}
+:deep(.ant-collapse-item-disabled > .ant-collapse-header) {
+  cursor: default !important;
+}
+</style>

package/src/base-client/components/common/XDatePicker/index.vue

@@ -175,6 +175,9 @@ export default {
       this.yearShowOne = status
     },
     RangePanelChange (value, mode) {
+      if (value.length === 0) {
+        return
+      }
       this.localValue = [
         moment(value[0]).format(this.formatType),
         moment(value[1]).format(this.formatType),

package/src/base-client/components/common/XReport/index.js

@@ -1,3 +1,3 @@
-import XReport from './XReport'
-
-export default XReport
+import XReport from './XReport'
+
+export default XReport

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

@@ -1,44 +1,44 @@
-<template>
-  <div id="test">
-    <a-card :bordered="false">
-      <XReport
-        ref="main"
-        :use-oss-for-img="false"
-        config-name="openPrescriptionCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :dont-format="true"/>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import XReport from './XReport'
-import XAddReport from '../XAddReport/XAddReport.vue'
-// eslint-disable-next-line no-unused-vars
-
-export default {
-  name: 'XReportDemo',
-  components: {
-    XReport, XAddReport
-  },
-  mounted () {
-    // this.$refs.xAddReport.init({
-    //   configName: 'skinTestExecuActionCover',
-    //   selectedId: '11111',
-    //   mixinData: {}
-    // })
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        :use-oss-for-img="false"
+        config-name="openPrescriptionCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :dont-format="true"/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from './XReport'
+import XAddReport from '../XAddReport/XAddReport.vue'
+// eslint-disable-next-line no-unused-vars
+
+export default {
+  name: 'XReportDemo',
+  components: {
+    XReport, XAddReport
+  },
+  mounted () {
+    // this.$refs.xAddReport.init({
+    //   configName: 'skinTestExecuActionCover',
+    //   selectedId: '11111',
+    //   mixinData: {}
+    // })
+  },
+  data () {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>