@bchr/bchr-front-lib 0.3.137 → 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 (7) hide show
  1. package/lib/base/AppFormulaFunctions.js +1 -1
  2. package/lib/base/layout/modal/SmartModal.js +9 -0
  3. package/lib/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js +7 -5
  4. package/package.json +2 -1
  5. package/src/base/AppFormulaFunctions.js +1 -1
  6. package/src/base/layout/modal/SmartModal.js +9 -0
  7. package/src/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js +5 -5
package/lib/base/AppFormulaFunctions.js CHANGED
@@ -87,7 +87,7 @@ window.AppFormulaFunctions = {
87
87
  digitsNum = 0;
88
88
  }
89
89
 
90
- var wa = Math.floor(parseFloat(baseWa * Math.pow(10, digitsNum) * percent));
90
+ var wa = parseFloat(baseWa * Math.pow(10, digitsNum) * percent);
91
91
 
92
92
  if (!calcType) {
93
93
  calcType = 3;
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
  },
@@ -82,6 +83,7 @@ var showInfo = function showInfo(options) {
82
83
  content: options.content,
83
84
  okText: options.okText,
84
85
  zIndex: options.zIndex,
86
+ closable: options.closable,
85
87
  onOk: function onOk() {
86
88
  options.okCallback ? options.okCallback() : function () {};
87
89
  }
@@ -99,6 +101,7 @@ var showSuccess = function showSuccess(options) {
99
101
  content: options.content,
100
102
  okText: options.okText,
101
103
  zIndex: options.zIndex,
104
+ closable: options.closable,
102
105
  onOk: function onOk() {
103
106
  options.okCallback ? options.okCallback() : function () {};
104
107
  }
@@ -116,6 +119,7 @@ var showError = function showError(options) {
116
119
  content: options.content,
117
120
  okText: options.okText,
118
121
  zIndex: options.zIndex,
122
+ closable: options.closable,
119
123
  onOk: function onOk() {
120
124
  options.okCallback ? options.okCallback() : function () {};
121
125
  }
@@ -133,6 +137,7 @@ var showWarn = function showWarn(options) {
133
137
  content: options.content,
134
138
  okText: options.okText,
135
139
  zIndex: options.zIndex,
140
+ closable: options.closable,
136
141
  onOk: function onOk() {
137
142
  options.okCallback ? options.okCallback() : function () {};
138
143
  }
@@ -152,6 +157,7 @@ var showAutoCloseInfo = function showAutoCloseInfo(options) {
152
157
  content: "".concat(timeOut, "\u79D2\u540E\u81EA\u52A8\u5173\u95ED"),
153
158
  okText: options.okText,
154
159
  zIndex: options.zIndex,
160
+ closable: options.closable,
155
161
  onOk: function onOk() {
156
162
  options.okCallback ? options.okCallback() : function () {};
157
163
  }
@@ -177,6 +183,7 @@ var showAutoCloseSuccess = function showAutoCloseSuccess(options) {
177
183
  content: "".concat(timeOut, "\u79D2\u540E\u81EA\u52A8\u5173\u95ED"),
178
184
  okText: options.okText,
179
185
  zIndex: options.zIndex,
186
+ closable: options.closable,
180
187
  onOk: function onOk() {
181
188
  options.okCallback ? options.okCallback() : function () {};
182
189
  }
@@ -202,6 +209,7 @@ var showAutoCloseError = function showAutoCloseError(options) {
202
209
  content: "".concat(timeOut, "\u79D2\u540E\u81EA\u52A8\u5173\u95ED"),
203
210
  okText: options.okText,
204
211
  zIndex: options.zIndex,
212
+ closable: options.closable,
205
213
  onOk: function onOk() {
206
214
  options.okCallback ? options.okCallback() : function () {};
207
215
  }
@@ -227,6 +235,7 @@ var showAutoCloseWarn = function showAutoCloseWarn(options) {
227
235
  content: "".concat(timeOut, "\u79D2\u540E\u81EA\u52A8\u5173\u95ED"),
228
236
  okText: options.okText,
229
237
  zIndex: options.zIndex,
238
+ closable: options.closable,
230
239
  onOk: function onOk() {
231
240
  options.okCallback ? options.okCallback() : function () {};
232
241
  }
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.137",
3
+ "version": "0.3.140",
4
4
  "description": "bchr front lib",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -49,3 +49,4 @@
49
49
  "react-loadable": "^5.5.0"
50
50
  }
51
51
  }
52
+
package/src/base/AppFormulaFunctions.js CHANGED
@@ -91,7 +91,7 @@ window.AppFormulaFunctions = {
91
91
  digitsNum = 0;
92
92
  }
93
93
 
94
- let wa = Math.floor(parseFloat(baseWa * Math.pow(10, digitsNum) * percent));
94
+ let wa = parseFloat(baseWa * Math.pow(10, digitsNum) * percent);
95
95
 
96
96
  if (!calcType) {
97
97
  calcType = 3;
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
  },
@@ -77,6 +78,7 @@ const showInfo = function(options) {
77
78
  content: options.content,
78
79
  okText: options.okText,
79
80
  zIndex: options.zIndex,
81
+ closable: options.closable,
80
82
  onOk() {
81
83
  options.okCallback ? options.okCallback() : function () {}
82
84
  },
@@ -94,6 +96,7 @@ const showSuccess = function(options) {
94
96
  content: options.content,
95
97
  okText: options.okText,
96
98
  zIndex: options.zIndex,
99
+ closable: options.closable,
97
100
  onOk() {
98
101
  options.okCallback ? options.okCallback() : function () {}
99
102
  },
@@ -111,6 +114,7 @@ const showError = function(options) {
111
114
  content: options.content,
112
115
  okText: options.okText,
113
116
  zIndex: options.zIndex,
117
+ closable: options.closable,
114
118
  onOk() {
115
119
  options.okCallback ? options.okCallback() : function () {}
116
120
  },
@@ -128,6 +132,7 @@ const showWarn = function(options) {
128
132
  content: options.content,
129
133
  okText: options.okText,
130
134
  zIndex: options.zIndex,
135
+ closable: options.closable,
131
136
  onOk() {
132
137
  options.okCallback ? options.okCallback() : function () {}
133
138
  },
@@ -147,6 +152,7 @@ const showAutoCloseInfo = function(options) {
147
152
  content: `${timeOut}秒后自动关闭`,
148
153
  okText: options.okText,
149
154
  zIndex: options.zIndex,
155
+ closable: options.closable,
150
156
  onOk() {
151
157
  options.okCallback ? options.okCallback() : function () {}
152
158
  },
@@ -171,6 +177,7 @@ const showAutoCloseSuccess = function(options) {
171
177
  content: `${timeOut}秒后自动关闭`,
172
178
  okText: options.okText,
173
179
  zIndex: options.zIndex,
180
+ closable: options.closable,
174
181
  onOk() {
175
182
  options.okCallback ? options.okCallback() : function () {}
176
183
  },
@@ -195,6 +202,7 @@ const showAutoCloseError = function(options) {
195
202
  content: `${timeOut}秒后自动关闭`,
196
203
  okText: options.okText,
197
204
  zIndex: options.zIndex,
205
+ closable: options.closable,
198
206
  onOk() {
199
207
  options.okCallback ? options.okCallback() : function () {}
200
208
  },
@@ -219,6 +227,7 @@ const showAutoCloseWarn = function(options) {
219
227
  content: `${timeOut}秒后自动关闭`,
220
228
  okText: options.okText,
221
229
  zIndex: options.zIndex,
230
+ closable: options.closable,
222
231
  onOk() {
223
232
  options.okCallback ? options.okCallback() : function () {}
224
233
  },
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 => {