vue2-client 1.15.103 → 1.15.105

package/package.json

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

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

@@ -67,7 +67,7 @@
         <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', 'x-text-card','x-tree-rows'].includes(panel.type)">
+        <template v-else-if="['x-form-table','x-simple-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', 'x-text-card','x-tree-rows'].includes(panel.type)">
           <component
             :is="getComponentName(panel.type)"
             :ref="`dynamicComponent_${ panel.type }_${ panelIndex }`"
@@ -116,7 +116,8 @@ export default {
     XTimeLine: () => import('@vue2-client/base-client/components/common/XTimeline/XTimeline.vue'),
     XRadio: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
     XTextCard: () => import('@vue2-client/base-client/components/his/XTextCard/XTextCard.vue'),
-    XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue')
+    XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue'),
+    XSimpleTable: () => import('@vue2-client/base-client/components/his/XSimpleTable/XSimpleTable.vue')
   },
   data () {
     return {

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

@@ -27,7 +27,7 @@
     </a-table>
   </div>
   <div v-else-if="pattern == 'form'">
-    <a-table :columns="columns" :data-source='data' :row-selection="rowSelection" bordered>
+    <a-table :columns="columns" :data-source='data' :row-selection="rowSelection" bordered :scroll="{ y: '70vh' }">
       <template v-for="(n, i) in inputColumns" :slot="n.dataIndex" slot-scope="text, record">
         <div class="a-div" :key="i">
           <a-input

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

@@ -0,0 +1,88 @@
+<template>
+  <a-table
+    :columns="processedColumns"
+    :dataSource="tableData"
+    :pagination="false"
+    :bordered="false"
+    :rowKey="rowKey"
+  />
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  props: {
+    queryParamsName: String,
+    rowKey: {
+      type: String,
+      default: 'id'
+    },
+    parameter: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data () {
+    return {
+      columns: [],
+      tableData: []
+    }
+  },
+  watch: {
+    queryParamsName: {
+      immediate: true,
+      handler (val) {
+        val && this.init(val, this.parameter)
+      }
+    }
+  },
+  computed: {
+    // 只处理headerStyle的列配置
+    processedColumns () {
+      return this.columns.map(column => ({
+        ...column,
+        customHeaderCell: column.headerStyle
+          ? () => ({ style: column.headerStyle })
+          : undefined
+      }))
+    }
+  },
+  methods: {
+    init (config, parameterData) {
+      getConfigByName(config, 'af-his', res => {
+        // 示例配置格式：
+        // columns: [{
+        //   title: '项目名称',
+        //   dataIndex: 'name',
+        //   headerStyle: { color: '#1890ff', fontWeight: 'bold' }
+        // }]
+        this.columns = res.columns || []
+
+        runLogic(res.logicName, parameterData, 'af-his').then(result => {
+          this.tableData = result.map((item, index) => ({
+            ...item,
+            key: item[this.rowKey] || `row_${index}`
+          }))
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 基础无边框样式 */
+/deep/ .ant-table {
+  border: none !important;
+}
+/deep/ .ant-table-tbody > tr > td {
+  border-bottom: none !important;
+  padding: 6px !important;
+}
+/deep/ .ant-table-thead > tr > th {
+  border-bottom: none !important;
+  background: none !important;
+  padding: 8px 6px !important;
+}
+</style>

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

@@ -66,7 +66,7 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/his/XShiftSchedule/dome.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),