vue2-client 1.18.1 → 1.18.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "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

@@ -86,6 +86,7 @@
             @editButtonStateDataClick="editButtonStateDataClick"
             @importExcelOk="importExcelOk"
             @rowClick="handleRowClick"
+            @rowDblClick="handleRowDblClick"
             @beforeDataChange="beforeDataChange"
             @expand="onExpand">
             <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
@@ -150,6 +151,7 @@
               @editButtonStateDataClick="editButtonStateDataClick"
               @importExcelOk="importExcelOk"
               @rowClick="handleRowClick"
+              @rowDblClick="handleRowDblClick"
               @beforeDataChange="beforeDataChange"
               @expand="onExpand">
               <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
@@ -1046,6 +1048,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    handleRowDblClick (record) {
+      this.$emit('rowDblClick', record)
+    },
     beforeDataChange (record) {
       this.$emit('beforeDataChange', record)
     },

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

@@ -9,6 +9,7 @@
       @selectRow="selectRow"
       @columnClick="columnClick"
       @ceshi="ceshi"
+      @rowDblClick="rowDblClick"
       :defaultQueryForm="{
         s_f_user_name: '张三'
       }"
@@ -58,6 +59,9 @@ export default {
     }
   },
   methods: {
+    rowDblClick (record) {
+      console.log('rowDblClick', record)
+    },
     // input框 行編輯參數傳遞
     ceshi (...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex

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

@@ -167,6 +167,7 @@
         :queryParamsName="queryParamsName"
         :disableAction="disableAction"
         @rowClick="handleRowClick"
+        @rowDblClick="handleRowDblClick"
         @beforeDataChange="beforeDataChange"
         @expand="onExpand">
         <template slot="expandedRowRender">
@@ -278,7 +279,8 @@
         ref="selectedDataTable"
         :load-selected-data="true"
         @beforeDataChange="beforeDataChange"
-        @rowClick="handleRowClick">
+        @rowClick="handleRowClick"
+        @rowDblClick="handleRowDblClick">
       </x-table-wrapper>
     </a-modal>
   </div>
@@ -1564,6 +1566,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    handleRowDblClick (record) {
+      this.$emit('rowDblClick', record)
+    },
     beforeDataChange (record) {
       this.$emit('beforeDataChange', record)
     },

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

@@ -25,6 +25,7 @@
     @beforeDataChange="beforeDataChange"
     @expand="onExpand"
     @rowClick="handleRowClick"
+    @rowDblClick="handleRowDblClick"
   >
     <template
       v-for="(item, c_index) in realTableColumns"
@@ -61,7 +62,7 @@
       </span>
       <CustomFuncCel
         :text="text"
-        :record="text"
+        :record="record"
         :index="index"
         :item="item"
         :localDataSource="activeTable?.localDataSource"
@@ -166,6 +167,7 @@
     :components="components"
     :rowStyleFunction="tableContext.rowStyleFunction"
     @rowClick="handleRowClick"
+    @rowDblClick="handleRowDblClick"
     @beforeDataChange="beforeDataChange"
   >
     <template
@@ -508,6 +510,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    handleRowDblClick (record) {
+      this.$emit('rowDblClick', record)
+    },
     beforeDataChange (record) {
       this.$emit('beforeDataChange', record)
     },

package/src/components/STable/index.js

@@ -185,6 +185,9 @@ export default {
     this.needTotalList = this.initTotalList(this.columns)
     // this.loadData()
   },
+  beforeDestroy () {
+    this.clearClickTimer()
+  },
   methods: {
     /**
      * 表格重新加载方法
@@ -371,19 +374,32 @@ export default {
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     },
-    handleRowClick (record, index) {
+    handleRowClick (record, index, event, options = {}) {
+      const { forceSelect = false, emitRowClick = true } = options
       const isRowKeySequence = this.rowKey === '序号'
       const currentRowKey = isRowKeySequence ? index : record[this.rowKey]
+      const isDoubleClick = event && event.detail > 1
+      const isSameRow = this.clickedRowKey === currentRowKey
+
+      if (forceSelect || isDoubleClick) {
+        this.clickedRowKey = currentRowKey
+        emitRowClick && this.$emit('rowClick', record)
+        return
+      }
 
       // 如果点击的是已选中的行，则取消选中；否则选中该行
-      if (this.clickedRowKey === currentRowKey) {
+      if (isSameRow) {
         this.clickedRowKey = null
-        this.$emit('rowClick', null) // 传递 null 表示取消选中
+        emitRowClick && this.$emit('rowClick', null) // 传递 null 表示取消选中
       } else {
         this.clickedRowKey = currentRowKey
-        this.$emit('rowClick', record)
+        emitRowClick && this.$emit('rowClick', record)
       }
     },
+    handleRowDoubleClick (record, index, event) {
+      this.handleRowClick(record, index, event, { forceSelect: true })
+      this.$emit('rowDblClick', record)
+    },
     handleRowMouseEnter (record, index) {
       if (this.rowKey === '序号') {
         this.hoveredRowKey = index
@@ -537,7 +553,8 @@ export default {
     props.customRow = (record, index) => {
       return {
         on: {
-          click: () => this.handleRowClick(record, index),
+          click: (event) => this.handleRowClick(record, index, event),
+          dblclick: (event) => this.handleRowDoubleClick(record, index, event),
           mouseenter: () => this.handleRowMouseEnter(record, index),
           mouseleave: () => this.handleRowMouseLeave(record, index)
         }