vue2-client 1.13.21 → 1.13.23

package/package.json

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

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

@@ -80,7 +80,8 @@
             @columnClick="columnClick"
             @gotoUserDetail="gotoUserDetail"
             @editButtonStateDataClick="editButtonStateDataClick"
-            @importExcelOk="importExcelOk">
+            @importExcelOk="importExcelOk"
+            @rowClick="handleRowClick">
             <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
               <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
             </template>
@@ -816,6 +817,10 @@ export default {
     // 直接转发事件的函数
     emitEvent (event, ...args) {
       this.$emit(event, ...args)
+    },
+    // 添加处理 rowClick 的方法
+    handleRowClick (record) {
+      this.$emit('rowClick', record)
     }
   },
   action: {

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

@@ -36,6 +36,7 @@
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
                 :queryParamsName="cell.slotConfig"
                 :configName="cell.slotConfig"
+                @rowClick="handleRowClick"
                 :countVisible="false"
                 :env="env"
               />
@@ -71,7 +72,7 @@
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
                 :queryParamsName="cell.slotConfig"
                 :configName="cell.slotConfig"
-                @listClick="listClick"
+                @rowClick="handleRowClick"
                 :countVisible="false"
                 :env="env"
               />
@@ -642,6 +643,9 @@ export default {
         }
       }
     },
+    handleRowClick (record) {
+      this.$emit('rowClick', record)
+    }
   },
   beforeMount () {
     if (this.useOssForImg) {

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

@@ -149,7 +149,7 @@
     </a-row>
     <!--  如果当前是表格模式  -->
     <template v-if="isTableMode">
-      <x-table-wrapper ref="table">
+      <x-table-wrapper ref="table" @rowClick="handleRowClick">
         <template slot="footer">
           <slot
             name="footer"
@@ -1302,6 +1302,9 @@ export default {
         item['序号'] = this.localEditModeDataSource[this.localEditModeDataSource.length - 1]['序号'] + 1
       }
       this.localEditModeDataSource.push(item)
+    },
+    handleRowClick (record) {
+      this.$emit('rowClick', record)
     }
   }
 }

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

@@ -16,6 +16,7 @@
     :setScrollYHeight="tableContext.setScrollYHeight"
     :selectRowMode="tableContext.selectRowMode"
     :size="tableContext.tableSize"
+    @rowClick="handleRowClick"
   >
     <template
       v-for="(item, c_index) in tableContext.tableColumns"
@@ -154,6 +155,9 @@ export default {
   },
   inject: ['tableContext'],
   methods: {
+    handleRowClick (record) {
+      this.$emit('rowClick', record)
+    },
     setLocalDataSource (data) {
       this.$refs.table.setLocalDataSource(data)
     },

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

@@ -1,5 +1,7 @@
 <template>
-    <div class="x-title">{{ title }}</div>
+    <div class="x-title" :class="{ 'with-underline': hasUnderline, 'only-line': isOnlyLine }">
+        <span v-show="!isOnlyLine">{{ processedTitle }}</span>
+    </div>
 </template>
 
 <script>
@@ -16,6 +18,17 @@ export default {
         title: ''
       }
     },
+    computed: {
+        processedTitle () {
+            return this.title.replace('</br>', '')
+        },
+        hasUnderline () {
+            return this.title.includes('</br>')
+        },
+        isOnlyLine () {
+            return this.title === '</br>'
+        }
+    },
     created () {
       this.getData(this.queryParamsName)
     },
@@ -36,4 +49,14 @@ export default {
     font-family: "Source Han Sans", sans-serif;
     color: #5D5C5C;
 }
+
+.with-underline {
+    border-bottom: 1px solid #5D5C5C;
+}
+
+.only-line {
+    height: 1px;
+    background-color: #5D5C5C;
+    margin: 13px 0;
+}
 </style>

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

@@ -53,8 +53,8 @@ routerResource.example = {
   path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XInput/XInput.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XInput/XInput.vue'),
+  component: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),