vue2-client 1.13.26 → 1.13.27

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

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

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

@@ -255,7 +255,7 @@ export default {
         let func = this.config.mountedFunction
         if (func && func.startsWith('function')) {
           func = func.replace('function', 'async function')
-          executeStrFunctionByContext(this, func, [])
+          executeStrFunctionByContext(this, func, [this])
         }
       }
     },

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>

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

@@ -149,7 +149,21 @@
     </a-row>
     <!--  如果当前是表格模式  -->
     <template v-if="isTableMode">
-      <x-table-wrapper ref="table" @rowClick="handleRowClick">
+      <x-table-wrapper ref="table">
+        <template slot="expandedRowRender">
+          <!-- 列扩展栅格 -->
+          <x-report
+            v-if="expandedGrid"
+            :env="env"
+            :isWidget="true"
+            :use-oss-for-img="false"
+            :config-name="expandedGrid"
+            :show-img-in-cell="true"
+            :display-only="true"
+            :edit-mode="false"
+            :show-save-button="false"
+            :dont-format="true"/>
+        </template>
         <template slot="footer">
           <slot
             name="footer"
@@ -309,6 +323,8 @@ export default {
       allowSelectRowNum: 0,
       // 头部附件的栅格配置名
       attachGrid: '',
+      // 表格行扩展区域的栅格配置名
+      expandedGrid: '',
       // 是否展示右侧工具栏
       showRightTools: true,
       // 是否展示左边按钮栏
@@ -634,6 +650,7 @@ export default {
         queryParams,
         tableColumns,
         attachGrid,
+        expandedGrid,
         buttonState,
         eventState = {},
         buttonPermissions,
@@ -695,6 +712,7 @@ export default {
         return
       }
       this.attachGrid = attachGrid
+      this.expandedGrid = expandedGrid
       this.viewMode = viewMode
       this.localEditMode = localEditMode
       this.formSubmitTypeInLocalEditMode = formSubmitTypeInLocalEditMode

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

@@ -1,6 +1,8 @@
 <template>
+  <!-- 当expandedGrid存在时渲染带有expandedRowRender的表格 -->
   <s-table
-    ref="table"
+    v-if="tableContext.expandedGrid"
+    ref="expandableTable"
     :id="tableContext.uniqueId"
     :alert="true"
     :columns="tableContext.tableColumns"
@@ -54,7 +56,138 @@
         :record="text"
         :index="index"
         :item="item"
-        :localDataSource="$refs.table.localDataSource"
+        :localDataSource="activeTable?.localDataSource"
+        v-else-if="item.slotCustomFunction"
+        :key="'customJs-' + c_index"></CustomFuncCel>
+      <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
+        <a @click="tableContext.columnClick(item.dataIndex,text,record)">{{ text }}</a>
+      </span>
+      <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
+        <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
+      </span>
+      <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
+        <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
+      </span>
+      <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
+        <x-badge
+          :service-name="tableContext.serviceName"
+          :env="tableContext.env"
+          v-if="text !== null && text !== undefined"
+          :badge-key="item.slotKeyMap"
+          :value="text"/>
+      </span>
+      <span v-else-if="item.slotType === 'date'" :key="'date-' + c_index">
+        {{ format(text, 'yyyy-MM-dd') }}
+      </span>
+      <span v-else-if="item.slotType === 'dateTime'" :key="'dateTime-' + c_index">
+        {{ format(text, 'yyyy-MM-dd hh:mm:ss') }}
+      </span>
+      <span v-else-if="item.slotType === 'towDecimal'" :key="'towDecimal-' + c_index">
+        {{ numberFormat(text, 2) }}
+      </span>
+      <span v-else-if="item.slotType === 'fourDecimal'" :key="'fourDecimal-' + c_index">
+        {{ numberFormat(text, 4) }}
+      </span>
+      <span v-else-if="item.slotType === 'int'" :key="'int-' + c_index">
+        {{ numberFormat(text, 0) }}
+      </span>
+      <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
+        <template v-if="item.actionArr && item.actionArr.length > 0">
+          <a-dropdown :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
+            <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-show="!action_item.customFunction || tableContext.customFunctionShow(action_item.customFunction,record,c_index)">
+                <a
+                  style="text-align: center"
+                  @click="tableContext.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="tableContext.action(record, item.dataIndex,'action', index)">{{ item.slotValue }}</a>
+        </template>
+      </span>
+    </template>
+    <template slot="expandedRowRender" slot-scope="record">
+      <slot
+        name="expandedRowRender"
+        :selectedRowKeys="tableContext.selectedRowKeys"
+        :selectedRows="tableContext.selectedRows"
+        :record="record"
+      ></slot>
+    </template>
+    <template slot="footer">
+      <slot
+        name="footer"
+        :selectedRowKeys="tableContext.selectedRowKeys"
+        :selectedRows="tableContext.selectedRows"></slot>
+    </template>
+  </s-table>
+
+  <!-- 当expandedGrid不存在时渲染不带expandedRowRender的表格 -->
+  <s-table
+    v-else
+    ref="simpleTable"
+    :id="tableContext.uniqueId"
+    :alert="true"
+    :columns="tableContext.tableColumns"
+    :data="loadData()"
+    :rowKey="tableContext.rowKey"
+    :showSummary="tableContext.showSummary"
+    :rowSelection="tableContext.rowSelection"
+    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
+    :showPagination="tableContext.showPagination"
+    :hidePagination="tableContext.simpleMode"
+    :showSelected="!tableContext.simpleMode"
+    :pageSize="tableContext.simpleMode ? 1000 : undefined"
+    :setScrollYHeight="tableContext.setScrollYHeight"
+    :selectRowMode="tableContext.selectRowMode"
+    :size="tableContext.tableSize"
+  >
+    <template
+      v-for="(item, c_index) in tableContext.tableColumns"
+      :slot="item.dataIndex"
+      slot-scope="text, record, index">
+      <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
+        <x-form-item
+          class="innerTable"
+          :style="{ paddingTop: 0, paddingBottom: 0, paddingLeft: 0, paddingRight: 0 }"
+          :form="record"
+          :attr="getFromItem(item.dataIndex,text, record, index)"
+          :service-name="tableContext.serviceName"
+          mode="新增/修改"
+          :env="tableContext.env"
+          :setForm="(obj)=>tableContext.setForm(record,obj)"
+          @rowChoose="(row, attr, callback) => tableContext.rowChoose(row, attr, callback, record)"
+          :showLabel="false"
+          :key="'editRow-' + c_index"
+        />
+      </template>
+      <span v-else-if="item.slotType === 'rate'" :key="'rate-' + c_index">
+        <x-rate
+          :value="text"
+          :disabled="true"
+          :allow-half="item.allowHalf"
+          :icon="item.rateIcon"
+          :max-count="item.maxCount"
+          style="zoom:0.9"/>
+      </span>
+      <span v-else-if="item.slotType === 'index'" :key="'index-' + c_index">
+        {{ index + 1 }}
+      </span>
+      <CustomFuncCel
+        :text="text"
+        :record="text"
+        :index="index"
+        :item="item"
+        :localDataSource="activeTable?.localDataSource"
         v-else-if="item.slotCustomFunction"
         :key="'customJs-' + c_index"></CustomFuncCel>
       <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
@@ -143,7 +276,11 @@ export default {
   },
   computed: {
     localDataSource () {
-      return this.$refs?.table?.localDataSource
+      return this.activeTable?.localDataSource
+    },
+    // 获取当前活动的表格实例
+    activeTable () {
+      return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
     }
   },
   props: {
@@ -159,7 +296,7 @@ export default {
       this.$emit('rowClick', record)
     },
     setLocalDataSource (data) {
-      this.$refs.table.setLocalDataSource(data)
+      this.activeTable?.setLocalDataSource(data)
     },
     loadData () {
       if (this.loadSelectedData) {
@@ -190,13 +327,13 @@ export default {
       })
     },
     updateSelect (selectedRowKeys, selectedRows) {
-      this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
+      this.activeTable?.updateSelect(selectedRowKeys, selectedRows)
     },
     clearSelected () {
-      this.$refs.table.clearSelected()
+      this.activeTable?.clearSelected()
     },
     refresh (bool) {
-      this.$refs.table.refresh(bool)
+      this.activeTable?.refresh(bool)
     },
 
     /**

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

@@ -1,72 +1,72 @@
-<template>
-  <div>
-    <a-select
-      v-model="selectedValue"
-      :placeholder="placeholder"
-      class="x-select"
-      :allowClear="true"
-      :showSearch="true"
-      :filter-option="filterOption"
-      @change="handleChange"
-    >
-      <a-select-option v-for="(item, index) in data" :key="index" :value="item.value">
-        {{ item.label }}
-      </a-select-option>
-    </a-select>
-  </div>
-</template>
-
-<script>
-import { runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XSelect',
-  props: {
-    queryParamsName: {
-      type: Object,
-      default: null
-    }
-  },
-  data () {
-    return {
-      data: [],
-      selectedValue: undefined,
-      placeholder: ''
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    async getData (config) {
-      try {
-        const res = await runLogic(config, {}, 'af-his')
-        this.data = res.data || []
-        if (res.placeholder) {
-          this.placeholder = res.placeholder
-        }
-        this.selectedValue = undefined
-      } catch (error) {
-        console.error('获取数据失败：', error)
-      }
-    },
-    handleChange (value) {
-      this.selectedValue = value === '' ? undefined : value
-      this.$emit('change', this.selectedValue)
-    },
-    filterOption (input, option) {
-      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    }
-  },
-  watch: {
-    selectedValue (val) {
-    }
-  }
-}
-</script>
-
-<style scoped>
-.x-select {
-  min-width: 150px;
-}
-</style>
+<template>
+  <div>
+    <a-select
+      v-model="selectedValue"
+      :placeholder="placeholder"
+      class="x-select"
+      :allowClear="true"
+      :showSearch="true"
+      :filter-option="filterOption"
+      @change="handleChange"
+    >
+      <a-select-option v-for="(item, index) in data" :key="index" :value="item.value">
+        {{ item.label }}
+      </a-select-option>
+    </a-select>
+  </div>
+</template>
+
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XSelect',
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      data: [],
+      selectedValue: undefined,
+      placeholder: ''
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+      try {
+        const res = await runLogic(config, {}, 'af-his')
+        this.data = res.data || []
+        if (res.placeholder) {
+          this.placeholder = res.placeholder
+        }
+        this.selectedValue = undefined
+      } catch (error) {
+        console.error('获取数据失败：', error)
+      }
+    },
+    handleChange (value) {
+      this.selectedValue = value === '' ? undefined : value
+      this.$emit('change', this.selectedValue)
+    },
+    filterOption (input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    }
+  },
+  watch: {
+    selectedValue (val) {
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-select {
+  min-width: 150px;
+}
+</style>