doway-coms 1.4.30 → 1.4.32

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1992,12 +1992,16 @@ export default {
         if (this.$refs.baseGrid.isInsertByRow(tempRow) === true) {
           tempRow["sysRowState"] = "add";
           tempRows.push(tempRow);
-          continue;
         }
-        // if (this.$refs.baseGrid.isUpdateByRow(tempRow) === true) {
-        //   //   tempRow['sysRowState'] = 'update'
-        //   //   tempRows.push(tempRow)
-        //   //   continue
+        //判断子项
+        // if(tempRow.children && tempRow.children.length>0){
+        //     //添加子项数据
+        //     XEUtils.arrayEach(tempRow.children,loopChild=>{
+        //       if (this.$refs.baseGrid.isInsertByRow(loopChild) === true){
+        //         loopChild["sysRowState"] = "add";
+        //         tempRows.push(loopChild);
+        //       }
+        //       })
         // }
       }
       
@@ -2259,20 +2263,22 @@ export default {
       });
     },
     filterConfirm(colInfo) {
-      console.log(colInfo);
+      let col= this.internalColumns.find(x=>x.field==colInfo.property)
+      this.$set(col.filters[0].data,'bindingValues',[])
       colInfo.filters[0].data.bindingValues = [];
       XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
         if (colInfo.params.controlType === controlType.select) {
           colInfo.filters[0].data.bindingValues.push(item);
+          this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
         } else {
           if (item.value[0] || item.value[1]) {
             colInfo.filters[0].data.bindingValues.push(item);
+            this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
           }
         }
       });
       colInfo.filters[0].checked =
         colInfo.filters[0].data.bindingValues.length > 0;
-
       if (this.filterRemote) {
         //设置筛选过滤条件
         this.setFilterExpression();
@@ -2344,7 +2350,7 @@ export default {
         };
         let expStr = "";
         let filterBindingValues = loopColInfo.filters[0].data.bindingValues;
-
+        debugger
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };
 

package/packages/utils/common.js

@@ -540,4 +540,27 @@ export function getExportParams(columns) {
     }
   }
   return tempParams
+}
+export function setFormButtons(toolBtns,statusBtns,permissionBtns){
+  XEUtils.arrayEach(permissionBtns,loopBtn=>{
+      let pushBtn = {
+        code: loopBtn.code,
+        caption: loopBtn.name,
+        visible: true
+      }
+      if(loopBtn.visibleState){
+        pushBtn['visibleStates'] = loopBtn.visibleState.split(',')
+      }
+      if(loopBtn.visibleStatus){
+        pushBtn['visibleStatuss'] = loopBtn.visibleStatus.split(',')
+      }
+      switch(loopBtn.buttonType){
+         case 'tool':
+            toolBtns.push(pushBtn)
+            break
+          case 'status':
+            statusBtns.push(pushBtn)
+            break
+      }
+  })
 }