@zgfe/modules-dm 1.0.57-zhongyuan.3 → 1.0.57-zhongyuan.30

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.
@@ -88,6 +88,7 @@ declare let apis: {
88
88
  exportFile: string;
89
89
  downloadTemple: string;
90
90
  allOpenStatus: string;
91
+ checkStatus: string;
91
92
  };
92
93
  clearRule: {
93
94
  getList: string;
@@ -95,11 +96,17 @@ declare let apis: {
95
96
  checkRule: string;
96
97
  getDetail: string;
97
98
  modifyRule: string;
98
- checkStatis: string;
99
+ checkStatus: string;
99
100
  selectStatus: string;
100
101
  deleteRule: string;
101
102
  exportFile: string;
102
103
  allOpenStatus: string;
103
104
  };
105
+ dict: {
106
+ dictList: string;
107
+ eventTag: string;
108
+ addLabelRelation: string;
109
+ delLabelRelation: string;
110
+ };
104
111
  };
105
112
  export default apis;
@@ -151,7 +151,8 @@ var apis = {
151
151
  downloadRule: '/zg/web/v2/verify/exportVerify',
152
152
  exportFile: '/zg/web/v2/verify/report/export',
153
153
  downloadTemple: '/zg/web/v2/verify/downloadMould',
154
- allOpenStatus: '/zg/web/v2/verify/statusMain'
154
+ allOpenStatus: '/zg/web/v2/verify/statusMain',
155
+ checkStatus: '/zg/web/v2/verify/statusBefore'
155
156
  },
156
157
  clearRule: {
157
158
  getList: '/zg/web/v2/rinseShiftRule/queryRinseShiftRuleList',
@@ -159,11 +160,17 @@ var apis = {
159
160
  checkRule: '/zg/web/v2/rinseShiftRule/updateRinseShiftRuleCheck',
160
161
  getDetail: '/zg/web/v2/rinseShiftRule/detail',
161
162
  modifyRule: '/zg/web/v2/rinseShiftRule/updateRinseShiftRule',
162
- checkStatis: '/zg/web/v2/rinseShiftRule/statusBefore',
163
+ checkStatus: '/zg/web/v2/rinseShiftRule/statusBefore',
163
164
  selectStatus: '/zg/web/v2/rinseShiftRule/status',
164
165
  deleteRule: '/zg/web/v2/rinseShiftRule/deleteRule',
165
166
  exportFile: '/zg/web/v2/rinseShiftRule/exportReport',
166
167
  allOpenStatus: '/zg/web/v2/rinseShiftRule/statusMain'
168
+ },
169
+ dict: {
170
+ dictList: '/zg/web/v2/systemSettings/attr/dict/list',
171
+ eventTag: '/zg/web/v2/eventLabel/list',
172
+ addLabelRelation: '/zg/web/v2/eventLabel/addLabelRelation',
173
+ delLabelRelation: '/zg/web/v2/eventLabel/delLabelRelation'
167
174
  }
168
175
  };
169
176
  export default apis;
@@ -145,3 +145,11 @@ export interface RuleDetailType {
145
145
  content: string;
146
146
  }[];
147
147
  }
148
+ export interface DictData {
149
+ dictName: string;
150
+ id: number;
151
+ }
152
+ export interface DictList {
153
+ label: string;
154
+ value: string;
155
+ }
@@ -14,7 +14,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
14
14
  function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
15
15
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
16
16
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
17
- import { Drawer, Input, Button, Space, Form, Checkbox, Radio, message, Select, InputNumber, Tooltip } from 'antd';
17
+ import { Drawer, Input, Button, Space, Form, Radio, message, Select, InputNumber, Tooltip } from 'antd';
18
18
  import { CloseOutlined } from '@ant-design/icons';
19
19
  import React, { useContext, useEffect, useState } from 'react';
20
20
  import { BizEventSelector, BizAttributeSelector, BizGlobalDataContext } from '@zgfe/business-lib';
@@ -48,24 +48,8 @@ var AddRule = function AddRule(_ref) {
48
48
  var onClose = function onClose() {
49
49
  setOpen(false);
50
50
  ruleForm.resetFields(); // 表单重置
51
- // conditionRef!.current!.deleteAll(); // 重置固定筛选数组
52
51
  // 清空属性的所有值
53
- setOptionsRule([{
54
- ruleType: 1,
55
- content: undefined
56
- }, {
57
- ruleType: 2,
58
- content: undefined
59
- }, {
60
- ruleType: 3,
61
- content: undefined
62
- }, {
63
- ruleType: 4,
64
- content: undefined
65
- }, {
66
- ruleType: 5,
67
- content: undefined
68
- }]);
52
+ setOptionsRule([]);
69
53
  setBizAttributeSelectorValue(undefined); // 清空属性
70
54
  setEvent({
71
55
  id: -100,
@@ -89,7 +73,9 @@ var AddRule = function AddRule(_ref) {
89
73
  ObjectType: selectType === 'eventProp' ? 1 : 2,
90
74
  event: selectType === 'eventProp' ? event.id : undefined,
91
75
  attr: bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.id,
92
- verifyDetail: currentRule.indexOf(5) > -1 ? [{
76
+ verifyDetail: optionsRule.findIndex(function (a) {
77
+ return a.ruleType == 5;
78
+ }) > -1 ? [{
93
79
  ruleType: 5
94
80
  }].concat(_toConsumableArray(optionsRule.filter(function (o) {
95
81
  return o.content;
@@ -97,7 +83,9 @@ var AddRule = function AddRule(_ref) {
97
83
  return o.content;
98
84
  }),
99
85
  status: ruleStatus == true ? 1 : 0,
100
- ruleType: currentRule,
86
+ ruleType: optionsRule.map(function (o) {
87
+ return o.ruleType;
88
+ }),
101
89
  appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
102
90
  extraMes: JSON.stringify(bizAttributeSelectorValue)
103
91
  }
@@ -109,7 +97,7 @@ var AddRule = function AddRule(_ref) {
109
97
  // 刷新列表
110
98
  getList();
111
99
  } else {
112
- message.error('修改规则失败!');
100
+ message.error(res.msg);
113
101
  }
114
102
  });
115
103
  return;
@@ -122,7 +110,9 @@ var AddRule = function AddRule(_ref) {
122
110
  ObjectType: selectType === 'eventProp' ? 1 : 2,
123
111
  event: selectType === 'eventProp' ? event.id : undefined,
124
112
  attr: bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.id,
125
- verifyDetail: currentRule.indexOf(5) > -1 ? [{
113
+ verifyDetail: optionsRule.findIndex(function (a) {
114
+ return a.ruleType == 5;
115
+ }) > -1 ? [{
126
116
  ruleType: 5
127
117
  }].concat(_toConsumableArray(optionsRule.filter(function (o) {
128
118
  return o.content;
@@ -130,7 +120,9 @@ var AddRule = function AddRule(_ref) {
130
120
  return o.content;
131
121
  }),
132
122
  status: ruleStatus == true ? 1 : 0,
133
- ruleType: currentRule,
123
+ ruleType: optionsRule.map(function (o) {
124
+ return o.ruleType;
125
+ }),
134
126
  appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
135
127
  extraMes: JSON.stringify(bizAttributeSelectorValue)
136
128
  }
@@ -142,7 +134,7 @@ var AddRule = function AddRule(_ref) {
142
134
  // 刷新列表
143
135
  getList();
144
136
  } else {
145
- message.error('添加规则失败!');
137
+ message.error(res.msg);
146
138
  }
147
139
  });
148
140
  };
@@ -150,26 +142,11 @@ var AddRule = function AddRule(_ref) {
150
142
  ruleForm.submit();
151
143
  };
152
144
  /** 规则类型 */
153
- var _useState5 = useState([{
154
- ruleType: 1,
155
- content: undefined
156
- }, {
157
- ruleType: 2,
158
- content: undefined
159
- }, {
160
- ruleType: 3,
161
- content: undefined
162
- }, {
163
- ruleType: 4,
164
- content: undefined
165
- }, {
166
- ruleType: 5,
167
- content: undefined
168
- }]),
145
+ var _useState5 = useState([]),
169
146
  _useState6 = _slicedToArray(_useState5, 2),
170
147
  optionsRule = _useState6[0],
171
148
  setOptionsRule = _useState6[1];
172
- var options = [{
149
+ var initOptions = [{
173
150
  label: '属性类型',
174
151
  value: 1
175
152
  }, {
@@ -185,28 +162,34 @@ var AddRule = function AddRule(_ref) {
185
162
  label: '非空',
186
163
  value: 5
187
164
  }];
188
- var _useState7 = useState([]),
165
+ var _useState7 = useState(initOptions),
189
166
  _useState8 = _slicedToArray(_useState7, 2),
190
- currentRule = _useState8[0],
191
- setCurrentRule = _useState8[1];
192
- var onChangeType = function onChangeType(value) {
193
- setCurrentRule(value);
194
- // 再次点击清空数据
195
- var newarr = optionsRule.map(function (o) {
196
- // 先处理第一个map的逻辑
197
- var baseItem = value.indexOf(o.ruleType) > -1 ? o : _objectSpread(_objectSpread({}, o), {}, {
198
- content: undefined
199
- });
200
- // 再处理第二个map的逻辑
201
- if (value.indexOf(1) > -1) {
202
- return baseItem.ruleType === 1 ? {
203
- ruleType: 1,
204
- content: bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type
205
- } : baseItem;
206
- }
207
- return baseItem;
208
- });
209
- setOptionsRule(newarr);
167
+ options = _useState8[0],
168
+ setOptions = _useState8[1];
169
+ var onChangeType = function onChangeType(type) {
170
+ if (type === 3) {
171
+ setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
172
+ ruleType: type,
173
+ content: '(1,1)'
174
+ }]));
175
+ return;
176
+ }
177
+ if (type === 1) {
178
+ setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
179
+ ruleType: type,
180
+ content: bizAttributeSelectorValue.type
181
+ }]));
182
+ return;
183
+ }
184
+ setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
185
+ ruleType: type,
186
+ content: undefined
187
+ }]));
188
+ };
189
+ var handleRuleDel = function handleRuleDel(index) {
190
+ setOptionsRule(optionsRule.filter(function (o, i) {
191
+ return i !== index;
192
+ }));
210
193
  };
211
194
  // 校验对象的类型 eventProp:事件校验 user:用户校验
212
195
  var _useState9 = useState(currentRuleDetail ? (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.objectType) == 1 ? 'eventProp' : 'user' : 'eventProp'),
@@ -218,22 +201,7 @@ var AddRule = function AddRule(_ref) {
218
201
  return event.target.value;
219
202
  });
220
203
  // 清空属性的所有值
221
- setOptionsRule([{
222
- ruleType: 1,
223
- content: undefined
224
- }, {
225
- ruleType: 2,
226
- content: undefined
227
- }, {
228
- ruleType: 3,
229
- content: undefined
230
- }, {
231
- ruleType: 4,
232
- content: undefined
233
- }, {
234
- ruleType: 5,
235
- content: undefined
236
- }]);
204
+ setOptionsRule([]);
237
205
  setBizAttributeSelectorValue(undefined); // 清空属性
238
206
  };
239
207
  var _useState11 = useState(currentRuleDetail ? currentRuleDetail.objectType == 1 ? {
@@ -263,27 +231,23 @@ var AddRule = function AddRule(_ref) {
263
231
  if (attr === undefined) {
264
232
  // 删除细分属性
265
233
  setBizAttributeSelectorValue(undefined);
234
+ setOptions([].concat(initOptions));
266
235
  } else {
267
236
  var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
268
- setBizAttributeSelectorValue({
269
- propCategory: attr.propCategory,
270
- category: attr.category,
271
- value: _value,
272
- id: attr.id,
273
- label: attr === null || attr === void 0 ? void 0 : attr.label,
274
- name: attr === null || attr === void 0 ? void 0 : attr.name,
275
- type: attr.type
276
- });
237
+ setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, attr), {}, {
238
+ value: _value
239
+ }));
277
240
  // 初始化属性基础类型
278
- if (currentRule.includes(1)) {
279
- var newArr = optionsRule;
280
- newArr.map(function (o) {
281
- if (o.ruleType == 1) {
282
- o.content = attr.type;
283
- }
284
- });
285
- setOptionsRule(newArr);
286
- }
241
+ var newArr = optionsRule.map(function (o) {
242
+ if (o.ruleType == 1) {
243
+ o.content = attr.type;
244
+ }
245
+ });
246
+ setOptionsRule(newArr);
247
+ setOptions(attr.type != '3' ? [].concat(initOptions, [{
248
+ label: '字典校验',
249
+ value: 6
250
+ }]) : [].concat(initOptions));
287
251
  }
288
252
  };
289
253
  useEffect(function () {
@@ -293,10 +257,12 @@ var AddRule = function AddRule(_ref) {
293
257
  selectType: selectType,
294
258
  event: event,
295
259
  bizAttributeSelectorValue: bizAttributeSelectorValue,
296
- currentRule: currentRule
260
+ currentRule: optionsRule.map(function (o) {
261
+ return o.ruleType;
262
+ })
297
263
  }
298
264
  });
299
- }, [selectType, currentRule, event, bizAttributeSelectorValue]);
265
+ }, [selectType, optionsRule, event, bizAttributeSelectorValue]);
300
266
  /**
301
267
  * 修改时回显数据
302
268
  */
@@ -307,23 +273,11 @@ var AddRule = function AddRule(_ref) {
307
273
  description: currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.ruleDescription,
308
274
  status: (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.status) == 1 ? true : false
309
275
  });
310
- var newArr = optionsRule;
311
- newArr.map(function (o) {
312
- currentRuleDetail.verifyDetailVo.map(function (j) {
313
- if (o.ruleType == j.ruleType) {
314
- o.content = j.content;
315
- }
316
- // 这个为模拟的区间数据
317
- if (o.ruleType == 3) {
318
- o.content = '(4,8]';
319
- }
320
- });
321
- });
322
- var currentTypeArr = currentRuleDetail.verifyDetailVo.map(function (o) {
323
- return o.ruleType;
324
- });
325
- setCurrentRule(currentTypeArr);
326
- setOptionsRule(newArr);
276
+ setOptionsRule(currentRuleDetail.verifyDetailVo);
277
+ setOptions(currentRuleDetail.verifyDetailVo[0] && currentRuleDetail.verifyDetailVo[0].content != '3' ? [].concat(initOptions, [{
278
+ label: '字典校验',
279
+ value: 6
280
+ }]) : [].concat(initOptions));
327
281
  }
328
282
  }, []);
329
283
  return /*#__PURE__*/React.createElement("div", {
@@ -359,7 +313,7 @@ var AddRule = function AddRule(_ref) {
359
313
  initialValues: {
360
314
  name: '',
361
315
  desctiption: '',
362
- ruleobj: []
316
+ ruleobj: {}
363
317
  },
364
318
  onFinish: onFinish,
365
319
  labelAlign: "left"
@@ -386,7 +340,7 @@ var AddRule = function AddRule(_ref) {
386
340
  name: "ruleobj",
387
341
  rules: [{
388
342
  required: true,
389
- message: '请寻找校验对象'
343
+ message: '请选择校验对象'
390
344
  }]
391
345
  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Radio.Group, {
392
346
  onChange: onSelectType,
@@ -395,7 +349,7 @@ var AddRule = function AddRule(_ref) {
395
349
  value: 'eventProp'
396
350
  }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C"), /*#__PURE__*/React.createElement(Radio, {
397
351
  value: 'user'
398
- }, "\u7528\u6237\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
352
+ }, "\u89D2\u8272\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
399
353
  className: "selectVent"
400
354
  }, selectType == 'eventProp' && (/*#__PURE__*/React.createElement(BizEventSelector, {
401
355
  showAllEvent: true,
@@ -415,7 +369,7 @@ var AddRule = function AddRule(_ref) {
415
369
  enableEnvProp: true,
416
370
  eventIdList: [event === null || event === void 0 ? void 0 : event.id],
417
371
  value: bizAttributeSelectorValue,
418
- enableDelete: true,
372
+ enableDelete: false,
419
373
  onChange: onChangeAttr,
420
374
  onDelete: function onDelete() {
421
375
  onChangeAttr(undefined);
@@ -423,22 +377,33 @@ var AddRule = function AddRule(_ref) {
423
377
  placeholder: "\u8BF7\u9009\u62E9\u7EC6\u5206\u5C5E\u6027"
424
378
  })), bizAttributeSelectorValue && (/*#__PURE__*/React.createElement("div", {
425
379
  className: "attrValue"
426
- }, currentRule.length > 1 && /*#__PURE__*/React.createElement("span", {
380
+ }, optionsRule.length > 1 && /*#__PURE__*/React.createElement("span", {
427
381
  className: "attrValue-styleLine"
428
- }, "\u4E14"), currentRule.map(function (o, index) {
382
+ }, "\u4E14"), optionsRule.map(function (o, index) {
429
383
  return /*#__PURE__*/React.createElement("div", {
430
384
  key: index,
431
385
  className: "attrValue-list"
432
386
  }, /*#__PURE__*/React.createElement("div", null, (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || bizAttributeSelectorValue.name), /*#__PURE__*/React.createElement(TypeComponent, {
433
- type: o,
387
+ type: o.ruleType,
434
388
  optionsValue: optionsRule,
435
389
  editStatus: currentRuleDetail ? true : false
436
- }));
437
- }))), /*#__PURE__*/React.createElement(Checkbox.Group, {
438
- options: options,
439
- value: currentRule,
440
- onChange: onChangeType
441
- }))))));
390
+ }), /*#__PURE__*/React.createElement("div", {
391
+ style: {
392
+ cursor: 'pointer'
393
+ },
394
+ onClick: function onClick() {
395
+ return handleRuleDel(index);
396
+ }
397
+ }, "X"));
398
+ }))), /*#__PURE__*/React.createElement(Space, null, options.map(function (item, index) {
399
+ return /*#__PURE__*/React.createElement(Button, {
400
+ key: index,
401
+ type: "primary",
402
+ onClick: function onClick() {
403
+ return onChangeType(item.value);
404
+ }
405
+ }, item.label);
406
+ })))))));
442
407
  };
443
408
  var optionsEnum = [];
444
409
  function parseRange(str) {
@@ -462,6 +427,8 @@ var TypeComponent = function TypeComponent(_ref2) {
462
427
  editStatus = _ref2.editStatus;
463
428
  // type:1 string 2:正则 3:数字区间 4:枚举
464
429
  var Component = null;
430
+ var _useContext2 = useContext(BizGlobalDataContext),
431
+ currentApp = _useContext2.currentApp;
465
432
  // 枚举
466
433
  var _useState15 = useState([]),
467
434
  _useState16 = _slicedToArray(_useState15, 2),
@@ -490,12 +457,40 @@ var TypeComponent = function TypeComponent(_ref2) {
490
457
  _useState24 = _slicedToArray(_useState23, 2),
491
458
  includedMaxState = _useState24[0],
492
459
  setIncludedMaxState = _useState24[1];
460
+ //字典
461
+ var _useState25 = useState([]),
462
+ _useState26 = _slicedToArray(_useState25, 2),
463
+ dictList = _useState26[0],
464
+ setDictList = _useState26[1];
465
+ var getDictList = function getDictList() {
466
+ request(apis.dict.dictList, {
467
+ method: 'post',
468
+ data: {
469
+ appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
470
+ }
471
+ }).then(function (res) {
472
+ if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
473
+ var _res$data;
474
+ setDictList((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
475
+ return {
476
+ label: item.dictName,
477
+ value: item.id + '',
478
+ id: item.id
479
+ };
480
+ }));
481
+ }
482
+ });
483
+ };
493
484
  // 只会执行一次 区间回显
494
485
  useEffect(function () {
495
486
  if (editStatus) {
496
- if (optionsValue.filter(function (o) {
487
+ var _optionsValue$filter, _optionsValue$filter$;
488
+ console.log(optionsValue, 'optionsValue', optionsValue.filter(function (o) {
497
489
  return o.ruleType == 3;
498
- })[0].content) {
490
+ }));
491
+ if ((_optionsValue$filter = optionsValue.filter(function (o) {
492
+ return o.ruleType == 3;
493
+ })) === null || _optionsValue$filter === void 0 ? void 0 : (_optionsValue$filter$ = _optionsValue$filter[0]) === null || _optionsValue$filter$ === void 0 ? void 0 : _optionsValue$filter$.content) {
499
494
  var qujian = optionsValue.filter(function (o) {
500
495
  return o.ruleType === 3 && o.content;
501
496
  });
@@ -503,9 +498,12 @@ var TypeComponent = function TypeComponent(_ref2) {
503
498
  setMinNum(val.firstNumber);
504
499
  setMaxNum(val.secondNumber);
505
500
  setIncludedMinState(val.leftSymbol == '(' ? false : true);
506
- setIncludedMaxState(val.rightSymbol == '(' ? false : true);
501
+ setIncludedMaxState(val.rightSymbol == ')' ? false : true);
507
502
  }
508
503
  }
504
+ if (type == 6) {
505
+ getDictList();
506
+ }
509
507
  }, []);
510
508
  switch (type) {
511
509
  case 1:
@@ -519,7 +517,7 @@ var TypeComponent = function TypeComponent(_ref2) {
519
517
  label: '字符串类型'
520
518
  }, {
521
519
  value: 2,
522
- label: '数字类型'
520
+ label: '数值类型'
523
521
  }, {
524
522
  value: 3,
525
523
  label: '日期类型'
@@ -548,8 +546,11 @@ var TypeComponent = function TypeComponent(_ref2) {
548
546
  Component = /*#__PURE__*/React.createElement("div", {
549
547
  className: "attrValue-list-right"
550
548
  }, /*#__PURE__*/React.createElement(Tooltip, {
551
- title: "\u70B9\u51FB\u5207\u6362[\u5F00\u542F/\u5173\u95ED]\u533A\u95F4"
549
+ title: "\u70B9\u51FB\u5207\u6362[\u5F00/\u95ED]\u533A\u95F4"
552
550
  }, /*#__PURE__*/React.createElement("div", {
551
+ style: {
552
+ cursor: 'pointer'
553
+ },
553
554
  onClick: function onClick() {
554
555
  setIncludedMinState(function (pre) {
555
556
  optionsValue.filter(function (r) {
@@ -579,8 +580,11 @@ var TypeComponent = function TypeComponent(_ref2) {
579
580
  })[0].content = "".concat(includedMinState ? '[' : '(').concat(minNum, ",").concat(value).concat(includedMaxState ? ']' : ')');
580
581
  }
581
582
  }), /*#__PURE__*/React.createElement(Tooltip, {
582
- title: "\u70B9\u51FB\u5207\u6362[\u5F00\u542F/\u5173\u95ED]\u533A\u95F4"
583
+ title: "\u70B9\u51FB\u5207\u6362[\u5F00/\u95ED]\u533A\u95F4"
583
584
  }, /*#__PURE__*/React.createElement("div", {
585
+ style: {
586
+ cursor: 'pointer'
587
+ },
584
588
  onClick: function onClick() {
585
589
  setIncludedMaxState(function (pre) {
586
590
  optionsValue.filter(function (r) {
@@ -605,6 +609,23 @@ var TypeComponent = function TypeComponent(_ref2) {
605
609
  options: optionsEnum
606
610
  });
607
611
  break;
612
+ case 6:
613
+ Component = /*#__PURE__*/React.createElement(Select
614
+ // defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
615
+ , {
616
+ // defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
617
+ value: optionsValue.filter(function (r) {
618
+ return r.ruleType == type;
619
+ })[0].content,
620
+ placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
621
+ options: dictList,
622
+ onChange: function onChange(value) {
623
+ optionsValue.filter(function (r) {
624
+ return r.ruleType == type;
625
+ })[0].content = value;
626
+ }
627
+ });
628
+ break;
608
629
  default:
609
630
  Component = /*#__PURE__*/React.createElement("div", null, "\u5FC5\u586B");
610
631
  break;
@@ -15,8 +15,8 @@
15
15
  height: 350px;
16
16
  }
17
17
  .clearRule-modal .ant-picker-dropdown {
18
- left: 13px !important;
19
18
  top: 133px !important;
19
+ left: 13px !important;
20
20
  }
21
21
  .clearRule-content {
22
22
  display: flex;
@@ -67,6 +67,7 @@
67
67
  .addRuleForm .ant-checkbox-wrapper {
68
68
  position: relative;
69
69
  margin-right: 8px;
70
+ margin-bottom: 8px;
70
71
  padding: 4px 15px;
71
72
  color: #333;
72
73
  vertical-align: middle;
@@ -125,7 +126,7 @@
125
126
  .addRuleForm .attrValue-list {
126
127
  display: grid;
127
128
  grid-gap: 20px;
128
- grid-template-columns: 80px 1fr;
129
+ grid-template-columns: 120px 1fr 50px;
129
130
  align-items: center;
130
131
  justify-content: space-between;
131
132
  margin: 20px 0px;
@@ -78,6 +78,7 @@
78
78
  .ant-checkbox-wrapper {
79
79
  position: relative;
80
80
  margin-right: 8px;
81
+ margin-bottom: 8px;
81
82
  padding: 4px 15px;
82
83
  color: #333;
83
84
  vertical-align: middle;
@@ -133,7 +134,7 @@
133
134
  &-list {
134
135
  display: grid;
135
136
  grid-gap: 20px;
136
- grid-template-columns: 80px 1fr;
137
+ grid-template-columns: 120px 1fr 50px;
137
138
  align-items: center;
138
139
  justify-content: space-between;
139
140
  margin: 20px 0px;