@bchr/bchr-front-lib 0.3.139 → 0.3.140

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 +1 -0
  2. package/lib/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js +7 -5
  3. package/package.json +1 -1
  4. package/src/base/layout/modal/SmartModal.js +1 -0
  5. package/src/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js +5 -5
package/lib/base/layout/modal/SmartModal.js CHANGED
@@ -61,6 +61,7 @@ var showConfirm = function showConfirm(options) {
61
61
  okText: options.okText,
62
62
  cancelText: options.cancelText,
63
63
  zIndex: options.zIndex,
64
+ closable: options.closable,
64
65
  onOk: function onOk() {
65
66
  options.okCallback ? options.okCallback() : function () {};
66
67
  },
package/lib/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js CHANGED
@@ -136,7 +136,9 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
136
136
 
137
137
  _defineProperty(_assertThisInitialized(_this2), "onGridHeaderSelectionChange", function () {
138
138
  var currentState = _this2.state;
139
- var pagerData = currentState.pagerData;
139
+ var _currentState$pagerDa = currentState.pagerData,
140
+ pagerData = _currentState$pagerDa.pagerData,
141
+ selectedPsnList = _currentState$pagerDa.selectedPsnList;
140
142
  var isAllPsnSelected = !currentState.isAllPsnSelected;
141
143
 
142
144
  if (pagerData.data && pagerData.data.length > 0) {
@@ -148,7 +150,7 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
148
150
  _this2.setState(_objectSpread(_objectSpread({}, currentState), {}, {
149
151
  pagerData: pagerData,
150
152
  isAllPsnSelected: isAllPsnSelected,
151
- selectedPsnList: []
153
+ selectedPsnList: selectedPsnList
152
154
  }));
153
155
  });
154
156
 
@@ -157,7 +159,7 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
157
159
  selectedRowData.selected = !selectedRowData.selected;
158
160
  var currentState = _this2.state;
159
161
  var selectedPsnList = [];
160
- var psnList = currentState.pagerData.data;
162
+ var psnList = currentState.pagerData.data || [];
161
163
  var isAllPsnSelected = true;
162
164
 
163
165
  if (psnList && psnList.length > 0) {
@@ -168,7 +170,7 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
168
170
  });
169
171
  }
170
172
 
171
- if (selectedPsnList.length != currentState.pagerData.total) {
173
+ if (selectedPsnList.length != psnList.length) {
172
174
  isAllPsnSelected = false;
173
175
  }
174
176
 
@@ -181,7 +183,7 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
181
183
  _defineProperty(_assertThisInitialized(_this2), "selectPsnRadiosChange", function (e) {
182
184
  var currentState = _this2.state;
183
185
  var selectedPsnList = [];
184
- var psnList = currentState.pagerData.data;
186
+ var psnList = currentState.pagerData.data || [];
185
187
 
186
188
  if (psnList && psnList.length > 0) {
187
189
  psnList.forEach(function (dataItem) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bchr/bchr-front-lib",
3
- "version": "0.3.139",
3
+ "version": "0.3.140",
4
4
  "description": "bchr front lib",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/base/layout/modal/SmartModal.js CHANGED
@@ -55,6 +55,7 @@ const showConfirm = function(options){
55
55
  okText: options.okText,
56
56
  cancelText: options.cancelText,
57
57
  zIndex: options.zIndex,
58
+ closable: options.closable,
58
59
  onOk() {
59
60
  options.okCallback ? options.okCallback() : function () {};
60
61
  },
package/src/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js CHANGED
@@ -312,7 +312,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
312
312
  */
313
313
  onGridHeaderSelectionChange = () => {
314
314
  let currentState = this.state;
315
- let pagerData = currentState.pagerData;
315
+ let {pagerData,selectedPsnList} = currentState.pagerData;
316
316
  let isAllPsnSelected = !currentState.isAllPsnSelected;
317
317
 
318
318
  if (pagerData.data && pagerData.data.length > 0) {
@@ -325,7 +325,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
325
325
  ...currentState,
326
326
  pagerData,
327
327
  isAllPsnSelected,
328
- selectedPsnList: []
328
+ selectedPsnList: selectedPsnList
329
329
  })
330
330
  }
331
331
 
@@ -339,7 +339,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
339
339
 
340
340
  let currentState = this.state;
341
341
  let selectedPsnList = [];
342
- let psnList = currentState.pagerData.data;
342
+ let psnList = currentState.pagerData.data || [];
343
343
  let isAllPsnSelected = true;
344
344
 
345
345
  if (psnList && psnList.length > 0) {
@@ -350,7 +350,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
350
350
  })
351
351
  }
352
352
 
353
- if (selectedPsnList.length != currentState.pagerData.total) {
353
+ if (selectedPsnList.length != psnList.length) {
354
354
  isAllPsnSelected = false;
355
355
  }
356
356
 
@@ -364,7 +364,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component {
364
364
  selectPsnRadiosChange = (e) => {
365
365
  let currentState = this.state;
366
366
  let selectedPsnList = [];
367
- let psnList = currentState.pagerData.data;
367
+ let psnList = currentState.pagerData.data || [];
368
368
 
369
369
  if (psnList && psnList.length > 0) {
370
370
  psnList.forEach(dataItem => {