vue2-client 1.12.90 → 1.12.93

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

@@ -1,8 +1,17 @@
 <template>
-  <div class="list-wrapper" >
+  <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)">
-        {{ item.number }} {{ item.name }}
+        <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>
@@ -10,20 +19,23 @@
 
 <script>
 
-import { runLogic } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XList',
   props: {
     queryParamsName: {
       type: Object,
-      default: 'outpatientWaitLogic'
-    },
+      default: 'outpatientWaitConfig'
+    }
   },
   inject: ['getComponentByName'],
   data () {
     return {
-      data: []
+      data: [],
+      button: false,
+      icon: false,
+      buttonName: ''
     }
   },
   created () {
@@ -31,8 +43,13 @@ export default {
   },
   methods: {
     async getData (config) {
-      runLogic(config, {}, 'af-his').then(res => {
-        this.data = res
+      getConfigByName(config, 'af-his', res => {
+        this.button = res.button
+        this.icon = res.icon
+        this.buttonName = res.buttonName
+        runLogic(res.mainSource, {}, 'af-his').then(resData => {
+          this.data = resData
+        })
       })
     },
     handleClick (index) {
@@ -41,7 +58,14 @@ export default {
     refreshList () {
       this.getData(this.queryParamsName)
     },
-
+    click (index) {
+      this.$emit('click', this.data[index + 1])
+    },
+    getIconStyle (item) {
+      return item.picture
+        ? { backgroundImage: `url(${item.picture})` }
+        : {}
+    }
   }
 }
 </script>
@@ -50,7 +74,6 @@ export default {
 .list-wrapper {
   max-height: 240px;
   overflow-y: auto;
-  cursor: pointer;
   padding-right: 2px;
 }
 
@@ -62,16 +85,31 @@ export default {
   height: 35px;
   border-radius: 6px;
   background-color: #F4F4F4;
-  padding: 8px 15px 7px 15px;
+  padding: 8px 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;
+  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;
 }
 
 /* 自定义滚动条样式 */

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

@@ -50,7 +50,7 @@ export default {
     return {
       isOpen: false,
       // 定义主内容区域的最大和最小宽度百分比
-      mainWithData: [{ max: 80, min: 56 }]
+      mainWithData: [{ max: 80, min: 50 }]
     }
   },
   mounted () {
@@ -82,7 +82,7 @@ export default {
           return []
         }
         // 获取a-row中的所有a-col
-        const allCols = Array.from(row.querySelectorAll('.ant-col-14'))
+        const allCols = Array.from(row.querySelectorAll('.ant-col-12'))
         // 过滤掉当前a-col，返回其他所有a-col
         return allCols.filter(col => col !== currentCol)
       } catch (error) {
@@ -102,7 +102,7 @@ export default {
             }
             if (currentCol) {
               // 更新当前列的宽度
-              const drawerWidth = isOpen ? 27 : 2
+              const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
@@ -190,7 +190,7 @@ export default {
 .arrow {
   font-size: 20px;
   line-height: 1;
-  color: rgba(24, 144, 245);
+  color: #94979E;
 }
 .drawer-content {
   height: 100%;

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

@@ -0,0 +1,99 @@
+<template>
+  <div class="x-time-select">
+    <a-range-picker
+      :value="dateRange"
+      :placeholder="['开始日期', '结束日期']"
+      separator="至"
+      :disabled="disabled"
+      :allowClear="allowClear"
+      :format="format"
+      @change="handleDateChange"
+    />
+  </div>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+
+export default {
+  name: 'XTimeSelect',
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    allowClear: {
+      type: Boolean,
+      default: true
+    },
+    format: {
+      type: String,
+      default: 'YYYY/MM/DD'
+    }
+  },
+  data () {
+    return {
+      dateRange: []
+    }
+  },
+  watch: {
+    value: {
+      handler (newVal) {
+        if (newVal && newVal.length === 2) {
+          this.dateRange = [
+            newVal[0] ? dayjs(newVal[0]) : null,
+            newVal[1] ? dayjs(newVal[1]) : null
+          ]
+        } else {
+          this.dateRange = []
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    handleDateChange (dates, dateStrings) {
+      this.dateRange = dates
+      console.warn(dateStrings)
+      this.$emit('change', dateStrings)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-time-select {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  display: block;
+}
+.x-time-select :deep(.ant-picker-range),
+.x-time-select :deep(.ant-picker) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+.x-time-select :deep(.ant-calendar-picker) {
+  width: 100%;
+  display: block;
+}
+.x-time-select :deep(.ant-calendar-picker-input) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+
+.x-time-select :deep(.ant-input) {
+  width: 100%;
+}
+</style>

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

@@ -52,9 +52,10 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
+  component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),