@zgfe/modules-dm 1.0.57-zhongyuan.55 → 1.0.57-zhongyuan.56

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/es/modules/clearRule/addRule.js +2 -2
  2. package/es/modules/clearRule/index.js +2 -1
  3. package/es/modules/formulateRule/addFormulate.js +6 -4
  4. package/es/modules/formulateRule/index.js +2 -1
  5. package/package.json +2 -2
package/es/modules/clearRule/addRule.js CHANGED
@@ -431,9 +431,9 @@ var AddRule = function AddRule(_ref) {
431
431
  value: 'eventProp'
432
432
  }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), ruleRowView && (/*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
433
433
  type: "link"
434
- }, "\u4E8B\u4EF6\u5C5E\u6027\uFF1A", currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : (_currentRuleDetail$ve = currentRuleDetail.verifyObject) === null || _currentRuleDetail$ve === void 0 ? void 0 : _currentRuleDetail$ve.split('|||')[0]), /*#__PURE__*/React.createElement(Button, {
434
+ }, "\u4E8B\u4EF6\u540D\u79F0\uFF1A", currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : (_currentRuleDetail$ve = currentRuleDetail.verifyObject) === null || _currentRuleDetail$ve === void 0 ? void 0 : _currentRuleDetail$ve.split('|||')[0]), /*#__PURE__*/React.createElement(Button, {
435
435
  type: "link"
436
- }, "\u7EC6\u5206\u5C5E\u6027\uFF1A", (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.name)))), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
436
+ }, "\u5C5E\u6027\u540D\u79F0\uFF1A", (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.name)))), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
437
437
  className: "selectVent"
438
438
  }, selectType == 'eventProp' && (/*#__PURE__*/React.createElement(BizEventSelector, {
439
439
  showAllEvent: true,
package/es/modules/clearRule/index.js CHANGED
@@ -311,7 +311,8 @@ var ClearRule = function ClearRule() {
311
311
  current: 1,
312
312
  pageSize: 10,
313
313
  total: 0,
314
- showQuickJumper: true
314
+ showQuickJumper: true,
315
+ showSizeChanger: true
315
316
  }),
316
317
  _useState32 = _slicedToArray(_useState31, 2),
317
318
  tableParams = _useState32[0],
package/es/modules/formulateRule/addFormulate.js CHANGED
@@ -198,15 +198,17 @@ var AddFormulate = function AddFormulate(_ref) {
198
198
  // 回显
199
199
  if (detailData) {
200
200
  var _detailData$rinseObje2, _detailData$rinseShif;
201
+ var currentTargetObj = res.data.data.find(function (o) {
202
+ var _detailData$rinseObje;
203
+ return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
204
+ });
201
205
  ruleForm.setFieldsValue({
202
206
  name: detailData.ruleName,
203
207
  description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
204
- target: res.data.data.find(function (o) {
205
- var _detailData$rinseObje;
206
- return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
207
- }) ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
208
+ target: currentTargetObj ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
208
209
  ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
209
210
  });
211
+ currentTargetObj && setCurrentBizAttributeSelectorValue(JSON.parse(currentTargetObj === null || currentTargetObj === void 0 ? void 0 : currentTargetObj.extraMes));
210
212
  var arr = detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseShif = detailData.rinseShiftRuleDetails) === null || _detailData$rinseShif === void 0 ? void 0 : _detailData$rinseShif.map(function (o) {
211
213
  var _shuzhiArr$find2, _shuzhiArr$find3;
212
214
  return {
package/es/modules/formulateRule/index.js CHANGED
@@ -272,7 +272,8 @@ var FormulateRule = function FormulateRule() {
272
272
  current: 1,
273
273
  pageSize: 10,
274
274
  total: 0,
275
- showQuickJumper: true
275
+ showQuickJumper: true,
276
+ showSizeChanger: true
276
277
  }),
277
278
  _useState8 = _slicedToArray(_useState7, 2),
278
279
  tableParams = _useState8[0],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-dm",
3
- "version": "1.0.57-zhongyuan.55",
3
+ "version": "1.0.57-zhongyuan.56",
4
4
  "license": "ISC",
5
5
  "module": "es/index.js",
6
6
  "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
57
57
  "umi-request": "^1.4.0",
58
58
  "yorkie": "^2.0.0"
59
59
  },
60
- "gitHead": "536301f132b432e8a8814b07cddf610c9854e1b0",
60
+ "gitHead": "9a8408cc7ebc8420d74a165d996b819c99bac0b8",
61
61
  "gitHooks": {
62
62
  "pre-commit": "lint-staged"
63
63
  }