imatrix-ui 0.2.44-up → 0.2.45-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "0.2.44-up",
+  "version": "0.2.45-test",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/department-tree/src/department-tree.vue

@@ -91,6 +91,9 @@ export default {
 			type: String,
 			default: ',',
 		},
+		this: {
+			type: Object,
+		}
 	},
 	data() {
 		let myTitle = this.$t('imatrixUIMessage.pleaseSelectDepartment')

package/packages/super-grid/src/super-grid.vue

@@ -60,8 +60,9 @@
         class="elTable"
         :tree-props="getTreeProps(parentProp, isSql, isLazy, dataSourceType)"
         @sort-change="handleSortChange"
-        @select="select"
-        @select-all="selectAll"
+        @select="selectRecord"
+        @select-all="selectAllRecord"
+        @selection-change="selectionChangeEvent"
         @row-click="rowClickEvent"
         @row-dblclick="rowDblclickEvent"
         @expand-change="expandChange"
@@ -657,6 +658,7 @@ export default {
       handler(newValue, oldValue) {
         console.log('watch====options.extraParam.entityMap===改变==', newValue)
         this.parentFormData = newValue
+        this.$emit('change-form-data', this.parentFormData)
       }
     }
   },
@@ -2918,6 +2920,81 @@ export default {
       store.set(this.code, gridParams)
       this['subTableData'] = data
     },
+    // 选择记录
+    selectRecord(selection, row){
+      let selectRecordEventResult = true
+      const gridParams = store.get(this.code)
+      if (isHasOptionFunction('selectRecord', this.code)) {
+        selectRecordEventResult = gridParams.options.selectRecord.call(this, {
+          gridData: this.isSubTableShowPage
+            ? this.subTableData
+            : this.gridData,
+          columns: gridParams.columns,
+          superGrid: this.$refs.superGrid,
+          pageGridData: this.isSubTableShowPage
+            ? this.gridData
+            : null,
+          additionalParamMap: gridParams.additionalParamMap,
+          selection: selection,
+          row: row,
+          parentFormData: this.parentFormData
+        })
+        if(selectRecordEventResult !== undefined &&  selectRecordEventResult=== false){
+          // 最后选中的记录取消选中状态
+          this.$refs.superGrid.toggleRowSelection(row, false)
+        }
+      }
+      this.select(selection, row)
+    },
+    // 取消选择记录
+    selectAllRecord(selection){
+      let selectAllRecordsEventResult = true
+      const gridParams = store.get(this.code)
+      if (isHasOptionFunction('selectAllRecords', this.code)) {
+        selectAllRecordsEventResult = gridParams.options.selectAllRecords.call(this, {
+          gridData: this.isSubTableShowPage
+            ? this.subTableData
+            : this.gridData,
+          columns: gridParams.columns,
+          superGrid: this.$refs.superGrid,
+          pageGridData: this.isSubTableShowPage
+            ? this.gridData
+            : null,
+          additionalParamMap: gridParams.additionalParamMap,
+          selection: selection,
+          parentFormData: this.parentFormData
+        })
+        if(selectAllRecordsEventResult !== undefined &&  selectAllRecordsEventResult=== false){
+          // 取消所有记录选中状态
+          this.$refs.superGrid.toggleAllSelection()
+        }
+      }
+      this.selectAll(selection)
+    },
+    // 选择记录发生改变时
+    selectionChangeEvent(newSelection){
+      const gridParams = store.get(this.code)
+      if (isHasOptionFunction('selectionChange', this.code)) {
+        gridParams.options.selectionChange.call(this, {
+          gridData: this.isSubTableShowPage
+            ? this.subTableData
+            : this.gridData,
+          columns: gridParams.columns,
+          superGrid: this.$refs.superGrid,
+          pageGridData: this.isSubTableShowPage
+            ? this.gridData
+            : null,
+          additionalParamMap: gridParams.additionalParamMap,
+          selection: newSelection,
+          parentFormData: this.parentFormData
+        })
+        // if(selectionChangeEventResult !== undefined &&  selectionChangeEventResult=== false){
+        //   // 最后选中的记录取消选中状态
+        //   this.$refs.superGrid.toggleRowSelection(newSelection[newSelection.length - 1], false)
+        // }
+      }
+      this.selectionChange(newSelection)
+    },
   },
   emits: [
     'change-grid-data',

package/src/styles/theme/dark-blue/dialog.scss

@@ -1,8 +1,4 @@
 .dark-blue {
-  .el-dialog__header {
-    padding: 22px 0px 0px 24px;
-  }
-
   .el-dialog__title::before {
     content: "";
     text-align: center;
@@ -18,4 +14,4 @@
   }
 
 
-}
+}