@bchr/bchr-front-lib 0.3.140 → 0.3.141

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/base/layout/modal/SmartModal.js +19 -19
  2. package/lib/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js +13 -9
  3. package/package.json +1 -1
  4. package/src/base/layout/modal/SmartModal.js +19 -19
  5. package/src/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js +17 -12
package/lib/base/layout/modal/SmartModal.js CHANGED
@@ -62,11 +62,11 @@ var showConfirm = function showConfirm(options) {
62
62
  cancelText: options.cancelText,
63
63
  zIndex: options.zIndex,
64
64
  closable: options.closable,
65
- onOk: function onOk() {
66
- options.okCallback ? options.okCallback() : function () {};
65
+ onOk: function onOk(e) {
66
+ options.okCallback ? options.okCallback(e) : function () {};
67
67
  },
68
68
  onCancel: function onCancel() {
69
- options.cancelCallback ? options.cancelCallback() : function () {};
69
+ options.cancelCallback ? options.cancelCallback(e) : function () {};
70
70
  },
71
71
  autoFocusButton: null
72
72
  });
@@ -84,8 +84,8 @@ var showInfo = function showInfo(options) {
84
84
  okText: options.okText,
85
85
  zIndex: options.zIndex,
86
86
  closable: options.closable,
87
- onOk: function onOk() {
88
- options.okCallback ? options.okCallback() : function () {};
87
+ onOk: function onOk(e) {
88
+ options.okCallback ? options.okCallback(e) : function () {};
89
89
  }
90
90
  });
91
91
 
@@ -102,8 +102,8 @@ var showSuccess = function showSuccess(options) {
102
102
  okText: options.okText,
103
103
  zIndex: options.zIndex,
104
104
  closable: options.closable,
105
- onOk: function onOk() {
106
- options.okCallback ? options.okCallback() : function () {};
105
+ onOk: function onOk(e) {
106
+ options.okCallback ? options.okCallback(e) : function () {};
107
107
  }
108
108
  });
109
109
 
@@ -120,8 +120,8 @@ var showError = function showError(options) {
120
120
  okText: options.okText,
121
121
  zIndex: options.zIndex,
122
122
  closable: options.closable,
123
- onOk: function onOk() {
124
- options.okCallback ? options.okCallback() : function () {};
123
+ onOk: function onOk(e) {
124
+ options.okCallback ? options.okCallback(e) : function () {};
125
125
  }
126
126
  });
127
127
 
@@ -138,8 +138,8 @@ var showWarn = function showWarn(options) {
138
138
  okText: options.okText,
139
139
  zIndex: options.zIndex,
140
140
  closable: options.closable,
141
- onOk: function onOk() {
142
- options.okCallback ? options.okCallback() : function () {};
141
+ onOk: function onOk(e) {
142
+ options.okCallback ? options.okCallback(e) : function () {};
143
143
  }
144
144
  });
145
145
 
@@ -158,8 +158,8 @@ var showAutoCloseInfo = function showAutoCloseInfo(options) {
158
158
  okText: options.okText,
159
159
  zIndex: options.zIndex,
160
160
  closable: options.closable,
161
- onOk: function onOk() {
162
- options.okCallback ? options.okCallback() : function () {};
161
+ onOk: function onOk(e) {
162
+ options.okCallback ? options.okCallback(e) : function () {};
163
163
  }
164
164
  });
165
165
 
@@ -184,8 +184,8 @@ var showAutoCloseSuccess = function showAutoCloseSuccess(options) {
184
184
  okText: options.okText,
185
185
  zIndex: options.zIndex,
186
186
  closable: options.closable,
187
- onOk: function onOk() {
188
- options.okCallback ? options.okCallback() : function () {};
187
+ onOk: function onOk(e) {
188
+ options.okCallback ? options.okCallback(e) : function () {};
189
189
  }
190
190
  });
191
191
 
@@ -210,8 +210,8 @@ var showAutoCloseError = function showAutoCloseError(options) {
210
210
  okText: options.okText,
211
211
  zIndex: options.zIndex,
212
212
  closable: options.closable,
213
- onOk: function onOk() {
214
- options.okCallback ? options.okCallback() : function () {};
213
+ onOk: function onOk(e) {
214
+ options.okCallback ? options.okCallback(e) : function () {};
215
215
  }
216
216
  });
217
217
 
@@ -236,8 +236,8 @@ var showAutoCloseWarn = function showAutoCloseWarn(options) {
236
236
  okText: options.okText,
237
237
  zIndex: options.zIndex,
238
238
  closable: options.closable,
239
- onOk: function onOk() {
240
- options.okCallback ? options.okCallback() : function () {};
239
+ onOk: function onOk(e) {
240
+ options.okCallback ? options.okCallback(e) : function () {};
241
241
  }
242
242
  });
243
243
 
package/lib/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js CHANGED
@@ -136,14 +136,17 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
136
136
 
137
137
  _defineProperty(_assertThisInitialized(_this2), "onGridHeaderSelectionChange", function () {
138
138
  var currentState = _this2.state;
139
- var _currentState$pagerDa = currentState.pagerData,
140
- pagerData = _currentState$pagerDa.pagerData,
141
- selectedPsnList = _currentState$pagerDa.selectedPsnList;
139
+ var pagerData = currentState.pagerData;
142
140
  var isAllPsnSelected = !currentState.isAllPsnSelected;
141
+ var selectedPsnList = [];
143
142
 
144
143
  if (pagerData.data && pagerData.data.length > 0) {
145
144
  pagerData.data.forEach(function (dataItem) {
146
145
  dataItem.selected = isAllPsnSelected;
146
+
147
+ if (isAllPsnSelected) {
148
+ selectedPsnList.push(dataItem);
149
+ }
147
150
  });
148
151
  }
149
152
 
@@ -457,8 +460,7 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
457
460
  }, {
458
461
  key: "render",
459
462
  value: function render() {
460
- var _this3 = this,
461
- _React$createElement;
463
+ var _this3 = this;
462
464
 
463
465
  var treeViewMessages = {
464
466
  retry: "重新加载",
@@ -557,13 +559,15 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
557
559
  onChange: _this3.onGridRowSelectionChange.bind(_this3, props)
558
560
  }));
559
561
  }
560
- }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, (_React$createElement = {
562
+ }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
561
563
  field: "sequence_number",
562
564
  title: "\u5E8F\u53F7",
563
- width: "50px",
564
565
  className: "text-center",
565
- headerClassName: "text-center"
566
- }, _defineProperty(_React$createElement, "width", "55px"), _defineProperty(_React$createElement, "sortable", false), _defineProperty(_React$createElement, "cell", _bchrFrontLib.GridRowSequenceNumberCell), _React$createElement)), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
566
+ headerClassName: "text-center",
567
+ width: "55px",
568
+ sortable: false,
569
+ cell: _bchrFrontLib.GridRowSequenceNumberCell
570
+ }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
567
571
  field: "name",
568
572
  title: "\u59D3\u540D",
569
573
  className: "text-center",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bchr/bchr-front-lib",
3
- "version": "0.3.140",
3
+ "version": "0.3.141",
4
4
  "description": "bchr front lib",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/base/layout/modal/SmartModal.js CHANGED
@@ -56,11 +56,11 @@ const showConfirm = function(options){
56
56
  cancelText: options.cancelText,
57
57
  zIndex: options.zIndex,
58
58
  closable: options.closable,
59
- onOk() {
60
- options.okCallback ? options.okCallback() : function () {};
59
+ onOk(e) {
60
+ options.okCallback ? options.okCallback(e) : function () {};
61
61
  },
62
62
  onCancel() {
63
- options.cancelCallback ? options.cancelCallback() : function() {};
63
+ options.cancelCallback ? options.cancelCallback(e) : function() {};
64
64
  },
65
65
  autoFocusButton: null
66
66
  });
@@ -79,8 +79,8 @@ const showInfo = function(options) {
79
79
  okText: options.okText,
80
80
  zIndex: options.zIndex,
81
81
  closable: options.closable,
82
- onOk() {
83
- options.okCallback ? options.okCallback() : function () {}
82
+ onOk(e) {
83
+ options.okCallback ? options.okCallback(e) : function () {}
84
84
  },
85
85
  });
86
86
 
@@ -97,8 +97,8 @@ const showSuccess = function(options) {
97
97
  okText: options.okText,
98
98
  zIndex: options.zIndex,
99
99
  closable: options.closable,
100
- onOk() {
101
- options.okCallback ? options.okCallback() : function () {}
100
+ onOk(e) {
101
+ options.okCallback ? options.okCallback(e) : function () {}
102
102
  },
103
103
  });
104
104
 
@@ -115,8 +115,8 @@ const showError = function(options) {
115
115
  okText: options.okText,
116
116
  zIndex: options.zIndex,
117
117
  closable: options.closable,
118
- onOk() {
119
- options.okCallback ? options.okCallback() : function () {}
118
+ onOk(e) {
119
+ options.okCallback ? options.okCallback(e) : function () {}
120
120
  },
121
121
  });
122
122
 
@@ -133,8 +133,8 @@ const showWarn = function(options) {
133
133
  okText: options.okText,
134
134
  zIndex: options.zIndex,
135
135
  closable: options.closable,
136
- onOk() {
137
- options.okCallback ? options.okCallback() : function () {}
136
+ onOk(e) {
137
+ options.okCallback ? options.okCallback(e) : function () {}
138
138
  },
139
139
  });
140
140
 
@@ -153,8 +153,8 @@ const showAutoCloseInfo = function(options) {
153
153
  okText: options.okText,
154
154
  zIndex: options.zIndex,
155
155
  closable: options.closable,
156
- onOk() {
157
- options.okCallback ? options.okCallback() : function () {}
156
+ onOk(e) {
157
+ options.okCallback ? options.okCallback(e) : function () {}
158
158
  },
159
159
  });
160
160
 
@@ -178,8 +178,8 @@ const showAutoCloseSuccess = function(options) {
178
178
  okText: options.okText,
179
179
  zIndex: options.zIndex,
180
180
  closable: options.closable,
181
- onOk() {
182
- options.okCallback ? options.okCallback() : function () {}
181
+ onOk(e) {
182
+ options.okCallback ? options.okCallback(e) : function () {}
183
183
  },
184
184
  });
185
185
 
@@ -203,8 +203,8 @@ const showAutoCloseError = function(options) {
203
203
  okText: options.okText,
204
204
  zIndex: options.zIndex,
205
205
  closable: options.closable,
206
- onOk() {
207
- options.okCallback ? options.okCallback() : function () {}
206
+ onOk(e) {
207
+ options.okCallback ? options.okCallback(e) : function () {}
208
208
  },
209
209
  });
210
210
 
@@ -228,8 +228,8 @@ const showAutoCloseWarn = function(options) {
228
228
  okText: options.okText,
229
229
  zIndex: options.zIndex,
230
230
  closable: options.closable,
231
- onOk() {
232
- options.okCallback ? options.okCallback() : function () {}
231
+ onOk(e) {
232
+ options.okCallback ? options.okCallback(e) : function () {}
233
233
  },
234
234
  });
235
235
 
package/src/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js CHANGED
@@ -312,12 +312,18 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
312
312
  */
313
313
  onGridHeaderSelectionChange = () => {
314
314
  let currentState = this.state;
315
- let {pagerData,selectedPsnList} = currentState.pagerData;
315
+ let {pagerData} = currentState;
316
316
  let isAllPsnSelected = !currentState.isAllPsnSelected;
317
317
 
318
+
319
+ let selectedPsnList = [];
318
320
  if (pagerData.data && pagerData.data.length > 0) {
319
321
  pagerData.data.forEach(dataItem => {
320
322
  dataItem.selected = isAllPsnSelected;
323
+ if (isAllPsnSelected) {
324
+ selectedPsnList.push(dataItem);
325
+ }
326
+
321
327
  })
322
328
  }
323
329
 
@@ -325,7 +331,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
325
331
  ...currentState,
326
332
  pagerData,
327
333
  isAllPsnSelected,
328
- selectedPsnList: selectedPsnList
334
+ selectedPsnList
329
335
  })
330
336
  }
331
337
 
@@ -455,22 +461,21 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
455
461
  <td className={"text-center locked_column k-grid-content-sticky"} style={{left: "0px", right: "0px"}}>
456
462
  <Radio name='selectDef' defaultChecked={props.dataItem.selected}
457
463
  className={"grid-radio"} key={props.dataIndex}
458
- onChange={this.selectPsnRadiosChange.bind(this, props)}
459
- ></Radio>
464
+ onChange={this.selectPsnRadiosChange.bind(this, props)}/>
460
465
  </td>)
461
466
  }}/> : <GridColumn locked field="selected" title="选择" width="50px" className={"text-center locked"}
462
467
  headerClassName={"text-center"} sortable={false} headerCell={props => {
463
- return <Checkbox checked={this.state.isAllPsnSelected} onChange={this.onGridHeaderSelectionChange}></Checkbox>
464
- }}
465
- cell={props => {
466
- return <td className={"text-center locked_column k-grid-content-sticky"} style={{left: "0px", right: "0px"}}>
467
- <Checkbox checked={props.dataItem.selected} onChange={this.onGridRowSelectionChange.bind(this, props)}></Checkbox>
468
- </td>
469
- }}
468
+ return <Checkbox checked={this.state.isAllPsnSelected} onChange={this.onGridHeaderSelectionChange}/>
469
+ }}
470
+ cell={props => {
471
+ return <td className={"text-center locked_column k-grid-content-sticky"} style={{left: "0px", right: "0px"}}>
472
+ <Checkbox checked={props.dataItem.selected} onChange={this.onGridRowSelectionChange.bind(this, props)}/>
473
+ </td>
474
+ }}
470
475
  />
471
476
 
472
477
  }
473
- <GridColumn field="sequence_number" title="序号" width="50px" className={"text-center"} headerClassName={"text-center"} width="55px" sortable={false} cell={GridRowSequenceNumberCell}/>
478
+ <GridColumn field="sequence_number" title="序号" className={"text-center"} headerClassName={"text-center"} width="55px" sortable={false} cell={GridRowSequenceNumberCell}/>
474
479
  <GridColumn field="name" title="姓名" className={"text-center"} headerClassName={"text-center"} width="120px" />
475
480
  <GridColumn field="code" title="人员编码" className={"text-center"} headerClassName={"text-center"} width="120px" />
476
481
  <GridColumn field="corp_ext_name" title="单位名称" className={"text-center"} headerClassName={"text-center"} width="180px" />