vue2-client 1.9.65 → 1.9.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.65",
+  "version": "1.9.67",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -9,7 +9,7 @@
     @cancel="close"
     @ok="onSubmit"
     v-bind="attr">
-    <div style="max-height: 70vh; overflow-y: auto;" v-if="showReport">
+    <div style="max-height: 70vh; overflow-y: auto;overflow-x: hidden;" v-if="showReport">
       <x-report
         @updateImg="updateImg"
         @selectRow="selectRow"

package/src/base-client/components/common/XButtons/XButtonDemo.vue

@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <x-buttons></x-buttons>
+  </div>
+</template>
+
+<script>
+  import XButtons from './XButtons.vue'
+
+  export default {
+    name: 'XButtonDemo',
+    components: {
+        XButtons
+    },
+    data () {
+      return {
+        configName: 'drugInventAuditTab'
+      }
+    },
+    methods: {},
+  }
+</script>

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

@@ -289,6 +289,7 @@ export default {
   flex-wrap: wrap;
   justify-content: space-between;
   overflow-y: auto;
+  overflow-x: hidden;
   max-height: 85vh;
 
   .data-card {

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

@@ -7,7 +7,7 @@
         :model="form"
         :rules="rules"
         layout="inline">
-        <a-row :gutter="24">
+        <a-row :gutter="24" type="flex">
           <x-form-item
             v-for="(item, index) in realJsonData.slice(0,7)"
             :showLabel="!simpleMode"
@@ -47,7 +47,7 @@
               @mounted="onItemMounted"
             />
           </div>
-          <a-col>
+          <a-col style="margin-left: auto">
             <span
               :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
               class="table-page-search-submitButtons">

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

@@ -1,36 +1,91 @@
 <template>
   <a-col
-    :xs="flex.xs"
-    :sm="flex.sm"
-    :md="flex.md"
-    :lg="flex.lg"
-    :xl="flex.xl"
-    :xxl="flex.xxl">
+    :style="computedStyles">
     <slot></slot>
   </a-col>
 </template>
 
 <script>
+const BREAKPOINTS = {
+  xs: 576,
+  sm: 768,
+  md: 992,
+  lg: 1200,
+  xl: 1600
+}
+
+function debounce (fn, delay) {
+  let timeout = null
+  return function (...args) {
+    if (timeout) clearTimeout(timeout)
+    timeout = setTimeout(() => {
+      fn.apply(this, args)
+    }, delay)
+  }
+}
 
 export default {
   name: 'XFormCol',
   props: {
     flex: {
       type: Object,
-      default: () => {
-        return {
-          xs: 24,
-          sm: 24,
-          md: 12,
-          lg: 8,
-          xl: 6,
-          xxl: 6
-        }
+      default: () => ({
+        xs: 24,
+        sm: 24,
+        md: 12,
+        lg: 8,
+        xl: 6,
+        xxl: 6,
+      }),
+    },
+  },
+  computed: {
+    computedFlex () {
+      const parentWidth = this.parentWidth
+      if (parentWidth === 0) {
+        return this.flex.xs
+      }
+      if (parentWidth < BREAKPOINTS.xs) return this.flex.xs
+      if (parentWidth < BREAKPOINTS.sm) return this.flex.sm
+      if (parentWidth < BREAKPOINTS.md) return this.flex.md
+      if (parentWidth < BREAKPOINTS.lg) return this.flex.lg
+      if (parentWidth < BREAKPOINTS.xl) return this.flex.xl
+      return this.flex.xxl
+    },
+    computedStyles () {
+      const flexValue = (this.computedFlex * 100) / 24
+      return {
+        flex: `0 0 ${flexValue}%`,
+        maxWidth: `${flexValue}%`,
       }
     }
   },
   data () {
-    return {}
+    return {
+      parentWidth: 0,
+    }
+  },
+  mounted () {
+    // 根据父容器宽度响应式
+    this.$nextTick(() => {
+      const container = this.$el.parentNode
+      this.parentWidth = container.offsetWidth
+      const updateWidth = debounce((width) => {
+        this.parentWidth = width
+      }, 100)
+
+      this.resizeObserver = new ResizeObserver((entries) => {
+        for (const entry of entries) {
+          updateWidth(entry.contentRect.width)
+        }
+      })
+      this.resizeObserver.observe(container)
+    })
+  },
+  beforeUnmount () {
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+    }
   }
 }
 </script>

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

@@ -55,7 +55,7 @@ export default {
       loading: false,
       allFormData: {},
       businessType: {},
-      env: 'prod',
+      env: 'dev',
       spinning: true,
       loadingErr: false,
       activeTab: 0

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

@@ -40,7 +40,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ChargeQueryCRUD',
+      queryParamsName: 'crud_dictionary_manage',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -27,7 +27,7 @@ export default {
     XReport, XAddReport
   },
   mounted () {
-      this.$refs.main.openDialog('medicalTestCover', -1, {})
+      this.$refs.main.openDialog('surgerySchedCover', -1, {})
   },
   data () {
     return {

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

@@ -411,6 +411,7 @@ export default {
     Upload,
     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'),
@@ -551,7 +552,7 @@ export default {
               }
             })
           }, this.env === 'dev')
-        } else if (cell.soltType === 'x-form-group') {
+        } else if (cell.slotType === 'x-form-group') {
           // 简易表单需要主动调用初始化方法
           getConfigByName(cell.slotConfig, cell.serviceName, (res) => {
             // 如果配置了 表单初始化logic

package/src/base-client/components/common/XTable/TableCellRenderer.vue

@@ -0,0 +1,161 @@
+<template>
+  <x-form-item
+    v-if="isEditMode && getFromItem(item.dataIndex)"
+    class="innerTable"
+    :form="record"
+    :attr="getFromItem(item.dataIndex)"
+    :service-name="serviceName"
+    mode="新增/修改"
+    :env="env"
+    :showLabel="false"
+  />
+  <!-- 序号列 -->
+  <span v-else-if="item.slotType === 'index'">
+    {{ index + 1 }}
+  </span>
+  <!-- 行链接 -->
+  <span v-else-if="item.slotType === 'link'">
+    <a @click="columnClick(item.dataIndex, text, record)">{{ text }}</a>
+  </span>
+  <!-- 文本溢出省略 -->
+  <span v-else-if="item.slotType === 'ellipsis'">
+    <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
+  </span>
+  <!-- 徽标 -->
+  <span v-else-if="item.slotType === 'badge'">
+    <x-badge
+      :service-name="serviceName"
+      :env="env"
+      v-if="text !== null && text !== undefined"
+      :badge-key="item.slotKeyMap"
+      :value="text"
+    />
+  </span>
+  <!-- 日期 -->
+  <span v-else-if="item.slotType === 'date'">
+    {{ format(text, 'yyyy-MM-dd') }}
+  </span>
+  <!-- 日期时间 -->
+  <span v-else-if="item.slotType === 'dateTime'">
+    {{ format(text, 'yyyy-MM-dd hh:mm:ss') }}
+  </span>
+  <!-- 两位小数 -->
+  <span v-else-if="item.slotType === 'towDecimal'">
+    {{ numberFormat(text, 2) }}
+  </span>
+  <!-- 四位小数 -->
+  <span v-else-if="item.slotType === 'fourDecimal'">
+    {{ numberFormat(text, 4) }}
+  </span>
+  <!-- 整数 -->
+  <span v-else-if="item.slotType === 'int'">
+    {{ numberFormat(text, 0) }}
+  </span>
+  <!-- 操作列 -->
+  <span v-else-if="item.slotType === 'action'">
+    <template v-if="item.actionArr && item.actionArr.length > 0">
+      <a-dropdown>
+        <a class="ant-dropdown-link" @click="e => e.preventDefault()">
+          {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
+        </a>
+        <a-menu slot="overlay" style="min-width: 60px">
+          <a-menu-item
+            v-for="(action_item, actionIndex) in item.actionArr"
+            :key="actionIndex"
+            v-if="!action_item.customFunction || executeStrFunction(action_item.customFunction, [record, c_index])"
+          >
+            <a style="text-align: center" @click="action(record, item.dataIndex, action_item.func)">
+              {{ action_item.text }}
+            </a>
+          </a-menu-item>
+        </a-menu>
+      </a-dropdown>
+    </template>
+    <template v-if="!item.actionArr || item.actionArr.length === 0">
+      <a @click="action(record, item.dataIndex)">{{ item.slotValue }}</a>
+    </template>
+  </span>
+</template>
+
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem.vue'
+import Ellipsis from '@vue2-client/components/Ellipsis/Ellipsis.vue'
+import XBadge from '@vue2-client/base-client/components/common/XBadge/XBadge.vue'
+import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
+import { formatDate } from '@/utils/util'
+
+export default {
+  components: { XBadge, Ellipsis, XFormItem },
+  props: {
+    item: {
+      type: Object,
+      required: true,
+    },
+    record: {
+      type: Object,
+      required: true,
+    },
+    index: {
+      type: Number,
+      required: true,
+    },
+    text: {
+      type: String,
+      required: true,
+    },
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: undefined
+    },
+    isEditMode: {
+      type: Boolean,
+      default: false
+    },
+    formItems: {
+      type: Array,
+      required: true,
+    },
+  },
+  methods: {
+    executeStrFunction,
+    getFromItem (model) {
+      const aa = this.formItems.find(item => item.model === model && item.editRow)
+      if (aa) {
+        return JSON.parse(JSON.stringify(aa))
+      }
+      return false
+    },
+    columnClick () {
+      this.$emit('columnClick', ...arguments)
+    },
+    action () {
+      this.$emit('action', ...arguments)
+    },
+    /**
+     * 格式化日期
+     * @param date 日期字符串
+     * @param format 格式化方式
+     */
+    format (date, format) {
+      return formatDate(date, format)
+    },
+    /**
+     * 格式化数字
+     * @param number string 或者 number
+     * @param decimalPlaces 小数位数
+     */
+    numberFormat (number, decimalPlaces = 2) {
+      const value = parseFloat(number)
+      if (!isNaN(value)) {
+        return value.toFixed(decimalPlaces)
+      } else {
+        return ''
+      }
+    },
+  },
+}
+</script>

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

@@ -85,9 +85,9 @@ routerResource.example = {
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示