adtec-core-package 0.8.4 → 0.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/Table/ElTableColumnEdit.vue

@@ -156,24 +156,6 @@ const { stop, pause, resume } = watchPausable(
   },
 )
 pause()
-//@ts-ignore
-watch(props.required, () => {
-  if (props.required) {
-    if (!props.scope.row.validateArr) {
-      props.scope.row.validateArr = []
-    }
-    if (props.scope.row.validateArr.indexOf(props.scope.column.property) === -1) {
-      props.scope.row.validateArr.push(props.scope.column.property)
-    }
-  } else {
-    if (props.scope.row.validateArr) {
-      props.scope.row.validateArr.splice(
-        props.scope.row.validateArr.indexOf(props.scope.column.property),
-        1,
-      )
-    }
-  }
-})
 onMounted(() => {
   // if (props.enableEditingStatus) {
   //   resume()
@@ -198,27 +180,6 @@ onMounted(() => {
   }
   table.value = instance1
   showOverflowTooltip.value = table.value?.props?.showOverflowTooltip
-  nextTick(() => {
-    if (props.required) {
-      if(props.scope) {
-        if (!props.scope!.row!.validateArr) {
-          props.scope.row.validateArr = []
-        }
-        if (props.scope.row.validateArr.indexOf(props.scope.column.property) === -1) {
-          props.scope.row.validateArr.push(props.scope.column.property)
-        }
-      }
-    } else {
-      if(props.scope) {
-        if (props.scope!.row!.validateArr) {
-          props.scope.row.validateArr.splice(
-            props.scope.row.validateArr.indexOf(props.scope.column.property),
-            1,
-          )
-        }
-      }
-    }
-  })
 })
 onUnmounted(() => {
   bus.off(listener)

package/src/components/Table/ElTableTool.ts

@@ -1,3 +1,5 @@
+import { ElMessage } from 'element-plus'
+
 /**
  * Create by丁盼
  * 说明: tableTool
@@ -7,20 +9,28 @@
 export default {
   /**
    * 校验表格数据是否为空
-   * @param table
+   * @param table 表格对象
+   * @param rules 校验规则
    */
-  validateTableData(table: any): Boolean {
+  validateTableData(table: any,rules:any): Boolean {
     try {
-      table.data.forEach((row: any) => {
-        const v = row.validateArr
-        v.forEach((val: any) => {
-          if (!row[val]) {
-            throw new Error()
+      const data=table.value?table.value.data:table.data
+      data.forEach((row: any,index:number) => {
+        for(let v in rules){
+          if (!row[v]) {
+            let msg=rules[v].message
+            if(msg){
+              msg=msg.replace('{index}',index+1)
+            }
+            throw new Error(msg)
           }
-        })
+        }
       })
       return true
-    } catch (e) {
+    } catch (e:any) {
+      if(e.message) {
+        ElMessage.error(e.message)
+      }
       return false
     }
   },