doway-coms 1.4.3 → 1.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -1932,6 +1932,16 @@ export default {
      */
     getUpdateRows() {
       let tempRows = [];
+      //先获取删除数据，因为前台删除一个明细后又添加相同的明细后台会
+      //报唯一索引错误，因为后台也是先添加然后再是删除的会照成问题
+      //所有就要把删除的放在数组的第一个传递过去，这样后台就先删除然后再新增了
+      let tempRemoveRows = this.$refs.baseGrid.getRemoveRecords();
+      for (let i = 0; i < tempRemoveRows.length; i++) {
+        let tempRow = tempRemoveRows[i];
+        tempRow["sysRowState"] = "delete";
+        tempRows.push(tempRow);
+      }
+
       let tempTableData = this.$refs.baseGrid.getTableData().fullData;
       for (let i = 0; i < tempTableData.length; i++) {
         let tempRow = tempTableData[i];
@@ -1940,19 +1950,13 @@ export default {
           tempRows.push(tempRow);
           continue;
         }
-        if (this.$refs.baseGrid.isUpdateByRow(tempRow) === true) {
-          //   tempRow['sysRowState'] = 'update'
-          //   tempRows.push(tempRow)
-          //   continue
-        }
-      }
-
-      let tempRemoveRows = this.$refs.baseGrid.getRemoveRecords();
-      for (let i = 0; i < tempRemoveRows.length; i++) {
-        let tempRow = tempRemoveRows[i];
-        tempRow["sysRowState"] = "delete";
-        tempRows.push(tempRow);
+        // if (this.$refs.baseGrid.isUpdateByRow(tempRow) === true) {
+        //   //   tempRow['sysRowState'] = 'update'
+        //   //   tempRows.push(tempRow)
+        //   //   continue
+        // }
       }
+      
       let tempUpdateRows = this.$refs.baseGrid.getUpdateRecords();
       for (let i = 0; i < tempUpdateRows.length; i++) {
         let tempRow = tempUpdateRows[i];

package/packages/utils/common.js

@@ -193,7 +193,8 @@ export function replaceParamString(
       },
       message: '错误',
       description: errors,
-      placement: 'topRight'
+      placement: 'topRight',
+      top: '100px'
     })
   }
   export function getUuid() {