vue2-client 1.9.87 → 1.9.89

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -33,7 +33,17 @@ this.openDialog('xxx', 5, {}, {}, {})
 - getTableData() 获取全部数据
 - setTableData(data) 设置表格内数据
 - Object.assign(this.fixedQueryForm, data) 给查询条件传值
+- getPrimaryData (rows) 返回主表不带别名的数据
+- pushPrimaryData (rows) 把不带主表别名的数据放到数据区
+- setFixedQueryForm (data) 设置固定条件，主表别名不用加
+- update() 让新修改的数据生效 
 - 事件相关
+  - 行编辑时，下拉选中处理，function (form,setForm,attr,util,self)
+    * form 当前编辑行
+    * setForm(form, {})给编辑行设置值
+    * attr.selectRows[] 选中的数据
+    * util 可以使用的工具方法
+    * self x-form-table组件自身
   - afterSubmit( type(新增/修改/擦和讯), id: (所操作的主键id), form: (请求的表单内容))  提交后触发
   - afterQuery( res (查询后数据), querparams (查询参数)) 查询后触发
     afterDelete( res (删除接口返回数据)) 删除后触发

package/package.json

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

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

@@ -642,10 +642,10 @@ export default {
           const childModel = item.model
           const childData = this.$refs[item.model].getTableData()
           for (let i = 0; i < childData.length; i++) {
-            childData[i] = this.handleFormKeys(childData[i])
+            childData[i] = this.handleFormKeys(childData[i], true)
             // 外键不需要带表别名，所以此处放到表单处理后赋值
             if (realForm.id) {
-              childData[i][item.childTableForeignKeyName] = realForm.id
+              childData[i][item.foreignKey] = realForm.id
             }
           }
           realForm[childModel] = childData
@@ -751,7 +751,7 @@ export default {
       }
     },
 
-    handleFormKeys (form) {
+    handleFormKeys (form, mustHandleKey = false) {
       const realForm = {}
       for (const key of Object.keys(form)) {
         const value = form[key]
@@ -764,7 +764,7 @@ export default {
           }
           realForm[extraFormKey][realKey] = value
         } else {
-          const realKey = this.isHandleFormKey ? this.getRealKey(key) : key
+          const realKey = this.isHandleFormKey || mustHandleKey ? this.getRealKey(key, mustHandleKey) : key
           // 如果发生重名，不覆盖，把key的别名带上
           if (realForm[realKey]) {
             realForm[key] = value
@@ -803,8 +803,8 @@ export default {
       })
     },
     // 获取表单字段实际值
-    getRealKey (key) {
-      if (this.isHandleFormKey) {
+    getRealKey (key, mustHandleKey = false) {
+      if (this.isHandleFormKey || mustHandleKey) {
         return key.substring(key.indexOf('_') + 1)
       } else {
         return key
@@ -870,13 +870,16 @@ export default {
       if (this.childFormData.length > 0) {
         for (const item of this.childFormData) {
           const child = this.$refs[item.model]
+          // 获取子表别名，以便在条件上添加别名
+          const alias = child.realQueryConfig.tableAliasName
           // 有主键，且主键有值，添加主键条件
           if (this.primaryKey && this.form[this.primaryKey]) {
             const foreignKey = item.foreignKey
+            const fixedQueryForm = { [alias + '_' + foreignKey]: this.form[this.primaryKey] }
             if (!child.fixedQueryForm) {
-              child.fixedQueryForm = { [foreignKey]: this.form[this.primaryKey] }
+              child.fixedQueryForm = fixedQueryForm
             } else {
-              Object.assign(child.fixedQueryForm, { [foreignKey]: this.form[this.primaryKey] })
+              Object.assign(child.fixedQueryForm, fixedQueryForm)
             }
             child.refreshTable()
           }

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

@@ -75,34 +75,18 @@
     </div>
     <div v-if="this.showPagination">
       <a-divider/>
-      <div v-if="!simpleMode">
-        <a-pagination
-          v-model="pageNum"
-          style="float: right"
-          :total="total"
-          show-less-items
-          :page-size="pageSize"
-          :page-size-options="pageSizeOptions"
-          show-size-changer
-          @change="pageNumChange"
-          :showTotal="paginationShowTotal"
-          @showSizeChange="pageSizeChange">
-        </a-pagination>
-      </div>
-      <div v-else>
-        <!-- simpleMode页面 -->
-        <a-pagination
-          v-model="pageNum"
-          style="float: right"
-          :total="total"
-          :page-size="pageSize"
-          :class="{'hide-page-numbers': true}"
-          :page-size-options="pageSizeOptions"
-          @change="pageNumChange"
-          :showTotal="paginationShowTotal"
-          @showSizeChange="pageSizeChange">
-        </a-pagination>
-      </div>
+      <a-pagination
+        v-model="pageNum"
+        style="float: right"
+        :total="total"
+        show-less-items
+        :page-size="pageSize"
+        :page-size-options="pageSizeOptions"
+        show-size-changer
+        @change="pageNumChange"
+        :showTotal="paginationShowTotal"
+        @showSizeChange="pageSizeChange">
+      </a-pagination>
     </div>
   </div>
 </template>
@@ -135,11 +119,6 @@ export default {
       type: Array,
       default: undefined
     },
-    // 是否简易模式
-    simpleMode: {
-      type: Boolean,
-      default: false
-    },
     tableColumns: {
       type: Array,
       default: undefined
@@ -151,6 +130,11 @@ export default {
       type: String,
       default: 'prod'
     },
+    // pageSize参数
+    prePageSize: {
+      type: Number,
+      default: undefined
+    },
     // 初始是否加载数据
     createdQuery: {
       type: Boolean,
@@ -175,6 +159,12 @@ export default {
       total: 0
     }
   },
+  created () {
+    // 根据参数初始化数据值
+    if (this.prePageSize) {
+      this.pageSize = this.prePageSize
+    }
+  },
   mounted () {
     // 配置初始化
     if (this.cardConfig) {

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

@@ -35,21 +35,21 @@
           @click="emitFunc(attr.inputOnAfterFunc,attr)">
           {{ attr.inputOnAfterName }}
         </a-button>
-        <!-- 状态按钮 -->
-        <x-status-button
-          v-else
-          :states="parseStates(attr.inputOnAfterName, attr.inputOnAfterFunc)"
-          v-on="generateDynamicEvents(attr.inputOnAfterFunc, attr)"
-          style="flex: 1; width: auto; min-width: 4rem; max-width: 6rem"
-        />
         <!--    仅可以配置 一个按钮 以及 一个图标插槽    -->
         <a-button
           style="width: 2rem; flex-shrink: 0;"
-          v-if="attr.inputOnAfterIcon"
+          v-else-if="attr.inputOnAfterIcon"
           :type="attr.inputOnAfterIcon && attr.inputOnAfterName ? 'primary' :''"
           :icon="attr.inputOnAfterIcon || 'question'"
           @click="emitFunc(attr.inputOnAfterIconFunc,attr)">
         </a-button>
+        <!-- 状态按钮 -->
+        <x-status-button
+          v-else
+          :states="parseStates(attr.inputOnAfterName, attr.inputOnAfterFunc)"
+          v-on="generateDynamicEvents(attr.inputOnAfterFunc, attr)"
+          style="flex: 1; width: auto; min-width: 4rem; max-width: 6rem"
+        />
       </a-input-group>
       <a-input-number
         v-else-if="attr.numberInput && !readOnly"
@@ -518,7 +518,7 @@
         placement="bottom"
         trigger="focus"
         :arrowPointAtCenter="true"
-        :overlayStyle="{ width: '1000px', height: '600px' }">
+        :overlayStyle="{ width: '1000px', height: '30vh' }">
         <template #content>
           <x-form-table
             title="请选择数据"

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

@@ -138,6 +138,11 @@ export default {
     XAddReport,
     XImportExcel
   },
+  provide () {
+    return {
+      getSelf: () => this,
+    }
+  },
   inject: ['getSelectedId', 'getSelectedData', 'getMixinData', 'getOutEnv', 'currUser'],
   data () {
     return {
@@ -330,6 +335,56 @@ export default {
     columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
+
+    // 获取主表的数据内容，去掉主表别名
+    getPrimaryData (rows) {
+      const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
+      const prefix = `${alias}_` // 构建前缀
+      const result = []
+
+      // 遍历 rows 的每一项，提取符合条件的数据
+      rows.forEach(row => {
+          const itemResult = {}
+          Object.keys(row).forEach(key => {
+              if (key.startsWith(prefix)) {
+                  const newKey = key.slice(prefix.length) // 去掉前缀
+                  itemResult[newKey] = row[key] // 添加到结果对象中
+              }
+          })
+          result.push(itemResult) // 将处理后的项添加到结果数组中
+      })
+
+      return result // 返回去掉前缀后的对象数组
+    },
+
+    // 给数据区域添加主表数据，给的数据没有主表别名，放着时添加主表别名
+    pushPrimaryData (rows) {
+        const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
+        const prefix = `${alias}_` // 构建前缀
+        const result = rows.map(row => {
+            const itemResult = {}
+            Object.keys(row).forEach(key => {
+                itemResult[prefix + key] = row[key] // 复制原始数据
+            })
+            return itemResult // 返回添加了主表别名的数据
+        })
+        // 把结果添加到数据区
+        this.getTableData().push(...result)
+    },
+
+    // 设置固定查询条件，主表别名自动带
+    setFixedQueryForm (data) {
+      const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
+      const prefixedData = {}
+
+      // 为每个键添加主表别名
+      Object.keys(data).forEach(key => {
+        prefixedData[`${alias}_${key}`] = data[key]
+      })
+
+      Object.assign(this.fixedQueryForm, prefixedData)
+    },
+
     importExcelOk () {
       this.$emit('importExcelOk')
     },
@@ -378,6 +433,7 @@ export default {
         this.updateComponents(res, true)
       }, this.env === 'dev')
     },
+
     /**
      * 更新子组件
      * @param res  参数
@@ -393,6 +449,7 @@ export default {
           this.$refs.xTable.init({
             formItems: res.formJson,
             primaryKey: res.primaryKey,
+            attachGrid: res.attachGrid,
             createdQuery: res.createdQuery,
             queryParams: setQueryParams ? res : null,
             tableColumns: res.columnJson,
@@ -648,6 +705,11 @@ export default {
     getTableData () {
       return this.$refs.xTable.getTableData()
     },
+    // 在行编辑等情况下，让界面生效
+    update () {
+      this.getTableData().push(...[])
+    },
+
     /**
      * 设置表格数据
      */

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

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

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

@@ -0,0 +1,107 @@
+<template>
+  <div class="tag-container">
+    <div class="tags-wrapper">
+      <a-tag
+        v-for="type in types"
+        :key="type.value"
+        @click="selectType(type.value)"
+        class="label-tag"
+        :class="{ 'active-tag': selectedType === type.value }"
+      >
+        {{ type.label }}
+      </a-tag>
+    </div>
+    <div class="underline" :style="underlineStyle"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: String,
+      default: null,
+    },
+  },
+  data () {
+    return {
+      selectedType: this.value,
+      types: null,
+      underlineStyle: {
+        width: '0',
+        left: '0',
+      },
+    }
+  },
+  watch: {
+    selectedType (newValue) {
+      this.$emit('input', newValue)
+      this.updateUnderline()
+    },
+  },
+  mounted () {
+    this.updateUnderline()
+  },
+  methods: {
+    init (params) {
+      const {
+        // 配置内容
+        options
+      } = params
+      this.types = options
+    },
+    selectType (value) {
+      this.selectedType = value
+    },
+    updateUnderline () {
+      // 动态更新下划线位置和宽度
+      this.$nextTick(() => {
+        const activeTag = this.$el.querySelector('.active-tag')
+        if (activeTag) {
+          const { offsetWidth, offsetLeft } = activeTag
+          this.underlineStyle.width = `${offsetWidth}px`
+          this.underlineStyle.left = `${offsetLeft}px`
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 容器样式 */
+.tag-container {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+}
+
+.tags-wrapper {
+  display: inline-flex; /* 标签紧邻排列 */
+  gap: 0; /* 去掉选项之间的空隙 */
+}
+
+.label-tag {
+  padding: 5px 15px;
+  font-size: 16px;
+  color: #333;
+  background: none;
+  cursor: pointer;
+  border: none;
+  display: inline-block;
+}
+
+.label-tag.active-tag {
+  color: #333; /* 不变色 */
+  font-weight: bold;
+}
+
+.underline {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 2px;
+  background-color: #1890ff;
+  transition: all 0.3s ease; /* 平滑过渡效果 */
+}
+</style>

package/src/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <h1>选择标签示例</h1>
+    <XLabelSelect
+      :options="options"
+      v-model="selectedOption"
+      label="请选择一个选项"
+    />
+    <p>选中的选项: {{ selectedOption }}</p>
+  </div>
+</template>
+
+<script>
+import XLabelSelect from '@/base-client/components/common/XLabelSelect/XLabelSelect.vue'
+
+export default {
+  components: {
+    XLabelSelect,
+  },
+  data () {
+    return {
+      selectedOption: null,
+      options: [
+        { value: 'option1', label: '选项 1' },
+        { value: 'option2', label: '选项 2' },
+        { value: 'option3', label: '选项 3' },
+      ],
+    }
+  },
+}
+</script>
+
+<style scoped>
+/* 添加样式 */
+</style>

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

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="medicalRecordCover"
+        :config-name="configName"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"
@@ -31,6 +31,8 @@ export default {
   },
   data () {
     return {
+      configName: 'medicalRecordCover'
+      // configName: 'physicianOrderEntryCover'
     }
   },
   methods: {

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

@@ -33,7 +33,7 @@
             </template>
             <template v-else-if="cell.type === 'slot'">
               <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-conversation'].includes(cell.slotType)">
+                v-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'].includes(cell.slotType)">
                 <component
                   :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                   :key="cellIndex"
@@ -435,6 +435,7 @@ export default {
     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'),
   },
   props: {
@@ -561,6 +562,7 @@ export default {
             console.info('给表单赋值', res)
             this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
               serviceName: cell.serviceName,
+              configName: cell.slotConfig,
               formItems: res.formJson,
               showSubmitBtn: !this.isInAModal,
               businessType: param.businessType || '新增',
@@ -597,6 +599,14 @@ export default {
               serviceName: cell.serviceName,
             })
           }, this.env === 'dev')
+        } else if (cell.slotType === 'x-label-select') {
+          // 按钮组需要主动调用初始化方法
+          getConfigByName(cell.slotConfig, cell.serviceName, (res) => {
+            this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
+              ...res,
+              serviceName: cell.serviceName,
+            })
+          }, this.env === 'dev')
         }
       }
       if (cell.slotType === 'x-report') {

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

@@ -1,7 +1,7 @@
 <template>
   <div v-show="tableColumns.length > 0">
     <a-row :gutter="48">
-      <a-col v-show="showLeftOperaBtn">
+      <a-col v-show="showLeftOperaBtn" :span="8">
         <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
           <a-space>
             <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -72,15 +72,28 @@
               <a-icon type="dashed" :style="iconStyle"/>
               {{ button.buttonName }}
             </a-button>
-
             <a-button v-if="allowedCardMode && !simpleMode" @click="changeViewMode" :type="isTableMode ? '' : 'primary'">
               看板模式
             </a-button>
             <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
           </a-space>
+
         </span>
       </a-col>
-      <a-col v-show="showRightTools && !simpleMode">
+      <a-col :span="8">
+        <!-- 头部附加栅格 -->
+        <x-report
+          v-if="attachGrid"
+          :env="env"
+          :use-oss-for-img="false"
+          :config-name="attachGrid"
+          :show-img-in-cell="true"
+          :display-only="true"
+          :edit-mode="false"
+          :show-save-button="false"
+          :dont-format="true"/>
+      </a-col>
+      <a-col v-show="showRightTools && !simpleMode" :span="8">
         <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
           <a-button-group>
             <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -102,7 +115,7 @@
       </a-col>
     </a-row>
     <!--  如果当前是表格模式  -->
-    <template v-if="isTableMode && !simpleMode">
+    <template v-if="isTableMode">
       <s-table
         ref="table"
         :id="uniqueId"
@@ -114,6 +127,9 @@
         :rowSelection="rowSelection"
         :scroll="{ x: scrollXWidth, y: scrollYHeight }"
         :showPagination="showPagination"
+        :hidePagination="simpleMode"
+        :showSelected="!simpleMode"
+        :pageSize="simpleMode ? 1000 : undefined"
         :setScrollYHeight="setScrollYHeight"
         size="default"
       >
@@ -129,6 +145,7 @@
               :service-name="serviceName"
               mode="新增/修改"
               :env="env"
+              @rowChoose="(row, attr, callback) => rowChoose(row, attr, callback, record)"
               :showLabel="false"
               :key="'editRow-' + c_index"
             />
@@ -211,7 +228,8 @@
         @cardEmit="handleCardEmit"
         :tableColumns="tableColumns"
         :card-config="cardModeConfig"
-        :show-pagination="true"
+        :show-pagination="!simpleMode"
+        :prePageSize="simpleMode ? 1000 : undefined"
         :serviceName="serviceName"
         :card-data="loadData"
         :env="env"
@@ -267,7 +285,7 @@
 </template>
 <script>
 import { Ellipsis, STable } from '@vue2-client/components'
-import { formatDate, getChangedData } from '@vue2-client/utils/util'
+import util, { formatDate, getChangedData, setDataByRealKey } from '@vue2-client/utils/util'
 import XBadge from '@vue2-client/base-client/components/common/XBadge'
 import TableSetting from '@vue2-client/components/TableSetting/TableSetting'
 import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
@@ -279,6 +297,7 @@ import {
   queryWithResource,
   remove,
   asyncRunTask,
+  getConfigByNameAsync,
   editRowSave,
   runLogic
 } from '@vue2-client/services/api/common'
@@ -289,6 +308,7 @@ import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
 import debounce from 'lodash.debounce'
 import XDataCard from '@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'
 import { getRealKeyData } from '@vue2-client/utils/formatter'
+import ReportTableHome from '../../../../pages/report/ReportTableHome.vue'
 
 export default {
   name: 'XTable',
@@ -299,8 +319,11 @@ export default {
     Ellipsis,
     XBadge,
     XImportExcel,
-    XFormItem
+    XFormItem,
+    XReport: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
+    ReportTableHome
   },
+  inject: ['getSelf'],
   data () {
     return {
       uniqueId: `x-table-${this._uid}`, // 使用 _uid 生成唯一 ID
@@ -318,6 +341,8 @@ export default {
       rowSelectMode: false,
       // 行选择模式-允许选中行数量，0：任意数量行，大于0：指定值数量的行
       allowSelectRowNum: 0,
+      // 头部附件的栅格配置名
+      attachGrid: '',
       // 是否展示右侧工具栏
       showRightTools: true,
       // 是否展示左边按钮栏
@@ -540,6 +565,29 @@ export default {
       this.refresh(true)
       this.$emit('importExcelOk')
     },
+    /**
+     * 行选择事件
+     * @param row 选中行集合
+     * @param attr 表单项属性
+     */
+    async rowChoose (row, attr, callback, record) {
+      // 如果配置了自定义函数
+      if (attr.dataChangeFunc) {
+        await executeStrFunction(attr.dataChangeFunc, [record, this.setForm, {
+          ...attr,
+          selectRows: row
+        }, util, this.getSelf(), this.mode, runLogic, getConfigByNameAsync])
+      } else {
+        // 默认填充选中行数据到当前表单
+        setDataByRealKey(record, row[0])
+      }
+      if (callback) {
+        callback()
+      }
+    },
+    setForm (record, obj) {
+      Object.assign(record, obj)
+    },
     handleResize () {
       debounce(() => {
         this.setScrollYHeight({})
@@ -573,6 +621,7 @@ export default {
         // 查询参数对象, 用于没有对应查询配置文件名时
         queryParams,
         tableColumns,
+        attachGrid,
         buttonState,
         buttonPermissions,
         editButtonStateData = [],
@@ -625,6 +674,7 @@ export default {
       if (this.tableColumns.length === 0) {
         return
       }
+      this.attachGrid = attachGrid
       this.viewMode = viewMode
       this.localEditMode = localEditMode
       this.rowSelectMode = rowSelectMode
@@ -677,6 +727,10 @@ export default {
       // 加载筛选列完成
       this.columnSelectLoaded = true
       this.setQueryForm(form || {})
+      // 简易模式，并且是看板模式，默认直接进入看板模式
+      if (this.allowedCardMode && this.simpleMode) {
+        this.isTableMode = false
+      }
     },
     // 操作面板按钮渲染
     buttonRendering (button) {

package/src/components/STable/index.js

@@ -73,6 +73,16 @@ export default {
       type: String | Boolean,
       default: 'auto'
     },
+    // 是否隐藏翻页，如果隐藏，彻底不显示翻译
+    hidePagination: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示表头已选择部分
+    showSelected: {
+      type: Boolean,
+      default: true
+    },
     /**
      * enable page URI mode
      *
@@ -371,9 +381,9 @@ export default {
 
     return (
       <div class="table-wrapper">
-        {showAlert ? this.renderAlert() : null}
+        {showAlert && this.showSelected ? this.renderAlert() : null}
         {table}
-        {pagination}
+        {!this.hidePagination ? pagination : null}
       </div>
     )
   }

package/src/pages/report/ReportTable.js

@@ -1,124 +1,124 @@
-export default {
-  name: 'ReportTable',
-  functional: true,
-  render (h, content) {
-    if (!content.props.tableData) {
-      console.log('没有报表数据')
-      return
-    }
-    console.log('content=>', content)
-    const html = reportCompute(h, content.props.tableData)
-    console.log('html=>', html)
-    // 报表整体高度和宽度
-    const reportClass = `h-${html.h} w-${html.w}`
-    return (
-      <div id='ReportTableHome'>
-        <div id='reportTable' class={reportClass}>
-          {html.el}
-        </div>
-      </div>
-    )
-  }
-}
-/**
- * class类生成
- * @param w 宽
- * @param h 高
- * @param l left
- * @param t top
- * @returns {string}
- */
-function generClass ({ w = 1, h = 1, l, t }) {
-  return `w-${w} h-${h} l-${l} t-${t}`
-}
-/**
- *  判断是否是个Number数据
- * @param value
- * @returns {boolean}
- */
-function typeNumber (value) {
-  return Object.prototype.toString.call(value) === '[object Number]'
-}
-/**
- * 判断是否是个object数据
- * @param value
- * @returns {boolean}
- */
-function typeObject (value) {
-  return Object.prototype.toString.call(value) === '[object Object]'
-}
-/**
- * 判断是否是个Array数据
- * @param value
- * @returns {boolean}
- */
-function typeArray (value) {
-  return Object.prototype.toString.call(value) === '[object Array]'
-}
-/**
- * 一行数据转换html函数
- * @param h vue的h
- * @param row 一行json数据
- * @param left 起始left距离
- * @param top 起始top距离
- * @returns {{el: Array, h: number}}
- */
-function rowCompute (h, row, left, top) {
-  if (typeObject(row)) {
-    const el = []
-    const keys = Object.keys(row).filter((res) => res !== 'span')
-    let heigth = 0
-    for (const key of keys.values()) {
-      const value = row[key]['value'] ? row[key]['value'] : row[key]
-      const style = { l: left, t: top + heigth }
-      style.w = row[key]['span'] ? row[key]['span'] : 1
-      const nextL = left + style.w
-      const nextT = top + heigth
-      const divObject = rowCompute(h, value, nextL, nextT)
-      el.push(divObject.el)
-      style.h = divObject.h ? divObject.h : 1
-      heigth += style.h
-      const attrs = { class: generClass(style) + ' title' }
-      const div = <div {...attrs}>{key === 'value' ? value : key}</div>
-      el.push(div)
-    }
-    return { h: heigth, el: el }
-  } else if (typeArray(row)) {
-    const el = []
-    for (const [i, value] of row.entries()) {
-      const style = { l: (left + i), t: top, w: 1, h: 1 }
-      const extraClass = typeNumber(value) ? 'bold' : 'title'
-      const attrs = { class: generClass(style) + ` ${extraClass}` }
-      const div = <div {...attrs}>{value}</div>
-      el.push(div)
-    }
-    return { h: 1, el: el }
-  }
-}
-/**
- * 完整报表数据转换html函数
- * @param h vue的h
- * @param jsonArr json数组
- * @returns {{el: Array, h: number}}
- */
-function reportCompute (h, jsonArr) {
-  const html = []
-  let heigth = 0
-  let width = 0
-  for (const [index, row] of jsonArr.entries()) {
-    const rowHtml = rowCompute(h, row, 0, index)
-    // 取第一行的宽度作为整个报表的宽度
-    if (index === 0) {
-      const reg = /w-\d\s/
-      for (const vNode of rowHtml.el) {
-        if (!vNode.data || !vNode.data.class) continue
-        const c = vNode.data.class
-        const w = c.match(reg)[0].split('-')[1]
-        width += (w - 0)
-      }
-    }
-    heigth += rowHtml.h
-    html.push(rowHtml.el)
-  }
-  return { el: html, h: heigth, w: width }
-}
+export default {
+  name: 'ReportTable',
+  functional: true,
+  render (h, content) {
+    if (!content.props.tableData) {
+      console.log('没有报表数据')
+      return
+    }
+    console.log('content=>', content)
+    const html = reportCompute(h, content.props.tableData)
+    console.log('html=>', html)
+    // 报表整体高度和宽度
+    const reportClass = `h-${html.h} w-${html.w}`
+    return (
+      <div id='ReportTableHome'>
+        <div id='reportTable' class={reportClass}>
+          {html.el}
+        </div>
+      </div>
+    )
+  }
+}
+/**
+ * class类生成
+ * @param w 宽
+ * @param h 高
+ * @param l left
+ * @param t top
+ * @returns {string}
+ */
+function generClass ({ w = 1, h = 1, l, t }) {
+  return `w-${w} h-${h} l-${l} t-${t}`
+}
+/**
+ *  判断是否是个Number数据
+ * @param value
+ * @returns {boolean}
+ */
+function typeNumber (value) {
+  return Object.prototype.toString.call(value) === '[object Number]'
+}
+/**
+ * 判断是否是个object数据
+ * @param value
+ * @returns {boolean}
+ */
+function typeObject (value) {
+  return Object.prototype.toString.call(value) === '[object Object]'
+}
+/**
+ * 判断是否是个Array数据
+ * @param value
+ * @returns {boolean}
+ */
+function typeArray (value) {
+  return Object.prototype.toString.call(value) === '[object Array]'
+}
+/**
+ * 一行数据转换html函数
+ * @param h vue的h
+ * @param row 一行json数据
+ * @param left 起始left距离
+ * @param top 起始top距离
+ * @returns {{el: Array, h: number}}
+ */
+function rowCompute (h, row, left, top) {
+  if (typeObject(row)) {
+    const el = []
+    const keys = Object.keys(row).filter((res) => res !== 'span')
+    let heigth = 0
+    for (const key of keys.values()) {
+      const value = row[key].value ? row[key].value : row[key]
+      const style = { l: left, t: top + heigth }
+      style.w = row[key].span ? row[key].span : 1
+      const nextL = left + style.w
+      const nextT = top + heigth
+      const divObject = rowCompute(h, value, nextL, nextT)
+      el.push(divObject.el)
+      style.h = divObject.h ? divObject.h : 1
+      heigth += style.h
+      const attrs = { class: generClass(style) + ' title' }
+      const div = <div {...attrs}>{key === 'value' ? value : key}</div>
+      el.push(div)
+    }
+    return { h: heigth, el: el }
+  } else if (typeArray(row)) {
+    const el = []
+    for (const [i, value] of row.entries()) {
+      const style = { l: (left + i), t: top, w: 1, h: 1 }
+      const extraClass = typeNumber(value) ? 'bold' : 'title'
+      const attrs = { class: generClass(style) + ` ${extraClass}` }
+      const div = <div {...attrs}>{value}</div>
+      el.push(div)
+    }
+    return { h: 1, el: el }
+  }
+}
+/**
+ * 完整报表数据转换html函数
+ * @param h vue的h
+ * @param jsonArr json数组
+ * @returns {{el: Array, h: number}}
+ */
+function reportCompute (h, jsonArr) {
+  const html = []
+  let heigth = 0
+  let width = 0
+  for (const [index, row] of jsonArr.entries()) {
+    const rowHtml = rowCompute(h, row, 0, index)
+    // 取第一行的宽度作为整个报表的宽度
+    if (index === 0) {
+      const reg = /w-\d\s/
+      for (const vNode of rowHtml.el) {
+        if (!vNode.data || !vNode.data.class) continue
+        const c = vNode.data.class
+        const w = c.match(reg)[0].split('-')[1]
+        width += (w - 0)
+      }
+    }
+    heigth += rowHtml.h
+    html.push(rowHtml.el)
+  }
+  return { el: html, h: heigth, w: width }
+}

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

@@ -87,12 +87,13 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/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'),
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
           meta: {
               // 菜单中不显示
               invisible: true,