n20-common-lib 3.2.30 → 3.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.30",
+  "version": "3.2.32",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/FileUploadTable/index.vue

@@ -824,7 +824,15 @@ export default {
           showClose: true
         })
       }
-      this.$emit('delete-rows', this.selectionList)
+      this.$msgboxPor({
+        title: $lc('确认删除所选附件吗？'),
+        message: $lc('删除后数据不可恢复'),
+        type: 'error',
+        confirmButtonText: $lc('确认'),
+        cancelButtonText: $lc('取消')
+      }).then(() => {
+        this.$emit('delete-rows', this.selectionList)
+      }).catch(() => undefined)
     },
 
     async getFileInfo(row, type) {

package/src/components/TablePro/cellClick.js

@@ -0,0 +1,38 @@
+const INTERACTIVE_CELL_TARGET_SELECTOR = [
+  'button',
+  '.el-button',
+  '.n20-button',
+  '[class*="button"]',
+  '.el-link',
+  '[class*="el-link--inner"]',
+  'a[href]',
+  'input',
+  'textarea',
+  'select',
+  'label',
+  '[contenteditable="true"]',
+  '.el-input',
+  '.el-textarea',
+  '.el-select',
+  '.el-input-number',
+  '.el-date-editor',
+  '.el-cascader',
+  '.el-switch',
+  '.el-radio',
+  '.el-checkbox',
+  '.el-slider',
+  '.el-rate',
+  '.el-upload',
+  '.n20-num-w',
+  '.n20-numberRange',
+  '.n20-date-select',
+  '.n20-input-search'
+].join(',')
+
+export function isTableCellInteractiveTarget(target) {
+  const element = target && target.nodeType === 1 ? target : target && target.parentElement
+  if (!element || typeof element.closest !== 'function') {
+    return false
+  }
+  return !!element.closest(INTERACTIVE_CELL_TARGET_SELECTOR)
+}

package/src/components/TablePro/index.vue

@@ -137,6 +137,7 @@ import empty from '../Empty'
 import tableSetSize from '../TableSetSize/index.vue'
 import { $lc } from '../../utils/i18n/index.js'
 import XEUtils from 'xe-utils'
+import { isTableCellInteractiveTarget } from './cellClick'
 const DEFAULT_SCROLL_Y = {
   enabled: true,
   gt: 30,
@@ -369,33 +370,11 @@ export default {
         return
       }
 
-      // 检查点击的目标元素是否是按钮或链接
-      // 需要检测多种按钮类型：
-      // - button: 原生按钮标签
-      // - .el-button: Element UI 按钮组件
-      // - .n20-button: n20 项目按钮组件
-      // - [class*="button"]: 包含 button 类名的元素
-      // - [class*="el-link--inner"]: Element UI 链接组件内部元素
-      // - a[href]: 链接标签
-      const target = $event.target
-      const clickedButton = target.closest(
-        'button, .el-button, .n20-button, [class*="button"], [class*="el-link--inner"], a[href]'
-      )
-
-      // 如果点击的是按钮或链接，不触发行勾选
-      if (clickedButton) {
+      // 点击输入框、下拉框、按钮等交互控件时，不触发行勾选
+      if (isTableCellInteractiveTarget($event.target)) {
         return
       }
 
-      // 如果 closest 没找到，检查父元素的类名是否包含操作相关的关键词
-      if (!clickedButton && target.parentElement) {
-        const parentClass = target.parentElement.className || ''
-        // 检测父元素是否包含：operate(操作)、btn(按钮)、button(按钮) 等关键词
-        if (parentClass.includes('operate') || parentClass.includes('btn') || parentClass.includes('button')) {
-          return
-        }
-      }
-
       // 检查该行是否可以被勾选
       let canCheck = true
       if (typeof this.forbidSelect === 'function') {

package/src/components/v3/TablePro/index.vue

@@ -453,6 +453,7 @@ import tableShowColumn from '../../ShowColumn/index.vue'
 import { saveTransform } from '../../ShowColumn/index.vue'
 import tableOperate from '../../TableOperate/index.vue'
 import OperateBtns from '../../TableProOperateColumn/OperateBtns.vue'
+import { isTableCellInteractiveTarget } from '../../TablePro/cellClick'
 
 const renderer = {
   name: 'renderer',
@@ -1154,33 +1155,11 @@ export default {
         return
       }
 
-      // 检查点击的目标元素是否是按钮或链接
-      // 需要检测多种按钮类型：
-      // - button: 原生按钮标签
-      // - .el-button: Element UI 按钮组件
-      // - .n20-button: n20 项目按钮组件
-      // - [class*="button"]: 包含 button 类名的元素
-      // - [class*="el-link--inner"]: Element UI 链接组件内部元素
-      // - a[href]: 链接标签
-      const target = $event.target
-      const clickedButton = target.closest(
-        'button, .el-button, .n20-button, [class*="button"], [class*="el-link--inner"], a[href]'
-      )
-
-      // 如果点击的是按钮或链接，不触发行勾选
-      if (clickedButton) {
+      // 点击输入框、下拉框、按钮等交互控件时，不触发行勾选
+      if (isTableCellInteractiveTarget($event.target)) {
         return
       }
 
-      // 如果 closest 没找到，检查父元素的类名是否包含操作相关的关键词
-      if (!clickedButton && target.parentElement) {
-        const parentClass = target.parentElement.className || ''
-        // 检测父元素是否包含：operate(操作)、btn(按钮)、button(按钮) 等关键词
-        if (parentClass.includes('operate') || parentClass.includes('btn') || parentClass.includes('button')) {
-          return
-        }
-      }
-
       // 检查该行是否可以被勾选
       let canCheck = true
       if (typeof this.forbidSelect === 'function') {

package/src/components/v3/UploadList/index.vue

@@ -611,9 +611,17 @@ export default {
      * @returns {void}
      */
     deleteSingleRow(row) {
-      const index = this.tableData.findIndex((item) => item === row)
-      if (index > -1) this.tableData.splice(index, 1)
-      this.$emit('delete-rows', [row])
+      this.$msgboxPor({
+        title: $lc('确认删除所选附件吗？'),
+        message: $lc('删除后数据不可恢复'),
+        type: 'error',
+        confirmButtonText: $lc('确认'),
+        cancelButtonText: $lc('取消')
+      }).then(() => {
+        const index = this.tableData.findIndex((item) => item === row)
+        if (index > -1) this.tableData.splice(index, 1)
+        this.$emit('delete-rows', [row])
+      }).catch(() => undefined)
     },
     /**
      * 切换展开/收起未上传类型。