@zgfe/business-lib 1.0.15-user.1 → 1.0.15-user.4

package/es/assets/styles/resetAntd.less

@@ -476,3 +476,7 @@
 .ant-dropdown {
   z-index: 6666 !important;
 }
+//message
+.ant-message {
+  z-index: 99999 !important;
+}

package/es/select/styles/handle.less

@@ -92,6 +92,7 @@
       display: flex;
       align-items: center;
       margin: 2px 4px 2px 0;
+      padding: 0 4px;
       padding-top: 1px;
       padding-bottom: 1px;
       background: none;

package/es/userCondition/conditionTypeList.js

@@ -22,25 +22,37 @@ var ConditionTypeList = function ConditionTypeList(props) {
     className: "biz-user-condition-type-container"
   }, /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "event",
     onClick: function onClick() {
       return onAdd('event');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u505A\u8FC7\uFF08\u6CA1\u505A\u8FC7\uFF09\u2026"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "event"
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u505A\u8FC7\uFF08\u6CA1\u505A\u8FC7\uFF09\u2026"))), /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "add",
     onClick: function onClick() {
       return onAdd('add');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u65B0\u589E\u4E8E"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "add"
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u65B0\u589E\u4E8E"))), /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "active",
     onClick: function onClick() {
       return onAdd('active');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u6D3B\u8DC3\u4E8E"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "active"
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u6D3B\u8DC3\u4E8E"))), /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "prop",
     onClick: function onClick() {
       return onAdd('prop');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))), openTagCondition ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "prop"
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))), openTagCondition ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('tag');

package/es/userCondition/conditions/eventCondition.js

@@ -26,6 +26,7 @@ var EventCondition = function EventCondition(props) {
 
   function onEventChange(data) {
     var event = data.event;
+    console.log(condition);
     onChange(_objectSpread(_objectSpread({}, condition), {}, {
       eventId: event.id
     }));

package/es/userCondition/conditions/styles/eventCondition.less

@@ -8,7 +8,7 @@
     flex: 1;
   }
   .biz-user-condition-event {
-    width: 355px;
+    width: 255px;
     .biz-event-select-handle {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
@@ -24,7 +24,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 30px;
+    width: 38px;
     height: 40px;
     margin-right: @margin-xs;
     margin-left: @border-radius-small;

package/es/userCondition/conditions/styles/periodCondition.less

@@ -7,6 +7,9 @@
   &-values,
   &-unit {
     margin-right: @margin-xs;
+    > input {
+      border: none !important;
+    }
   }
   &-operator {
     width: 129px;

package/es/userCondition/conditions/styles/runTimesCondition.less

@@ -9,6 +9,9 @@
   &-value {
     width: 58px;
     margin-right: @margin-xs;
+    > input {
+      border: none !important;
+    }
   }
   .biz-user-condition-runtimes-tip {
     color: @primary-color;

package/es/userCondition/demo/index.js

@@ -150,20 +150,54 @@ var getTagList = Promise.resolve([{
 }]);
 var data = {
   json: [[{
-    attrs: [],
-    labels: {
-      operator: 'equal',
-      values: [77388914425856, 77383474429952, 77384417755136]
-    }
-  }], [{
     attrs: [{
       attrId: 114,
       attrName: 'name',
       category: 'custom',
       operator: 'equal',
-      params: ['Safari', 'Microsoft Edge'],
+      params: ['Safari', 'Microsoft Edge', 'Apple WebKit'],
       attrType: 'cont-string'
     }]
+  }, {
+    eventId: 24143016,
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    },
+    attrs: [{
+      attrId: 30183431,
+      attrName: '用户open_id',
+      category: 'custom',
+      operator: 'equal',
+      params: ['Apple WebKit', 'Safari', 'Microsoft Edge', 'Unknown'],
+      attrType: 'cont-string'
+    }],
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '0']
+    }
+  }], [{
+    eventId: '-3',
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '0']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    },
+    attrs: []
+  }, {
+    eventId: '-4',
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '1']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    },
+    attrs: []
   }]]
 };
 export default (function () {

package/es/userCondition/index.js

@@ -118,7 +118,7 @@ var BizUserCondition = function BizUserCondition(props) {
 
     setValue(newValue);
     setDataList(newDataList);
-    props.onChange(newValue);
+    props.onChange && props.onChange(newValue);
   }
 
   return /*#__PURE__*/React.createElement(BizUserConditionContext.Provider, {
@@ -139,14 +139,14 @@ var BizUserCondition = function BizUserCondition(props) {
   }, "\u4E14"), showList.length ? /*#__PURE__*/React.createElement("div", {
     className: ["".concat(classPrefix, "-and-conditions-wrap"), props.textMode ? 'text-mode' : ''].join(' ')
   }, showList.map(function (item, i) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OrConditions, {
+    return /*#__PURE__*/React.createElement(OrConditions, {
       showAndDesc: i > 0,
       orConditions: item.orConditions,
       key: item.id,
       onChange: function onChange(data) {
         _onChange(item.id, data);
       }
-    }));
+    });
   })) : null), /*#__PURE__*/React.createElement(ConditionTypeList, {
     show: value.length < andConditionNum,
     label: "\u4E14",

package/es/userCondition/orConditions.js

@@ -47,14 +47,8 @@ var OrConditions = function OrConditions(props) {
       showList = _useState2[0],
       setShowList = _useState2[1];
 
-  var _useState3 = useState(orConditions),
-      _useState4 = _slicedToArray(_useState3, 2),
-      value = _useState4[0],
-      setValue = _useState4[1];
-
   useEffect(function () {
     if (orConditions) {
-      setValue(orConditions);
       initShowList();
     }
   }, [orConditions]);
@@ -77,8 +71,9 @@ var OrConditions = function OrConditions(props) {
       id: Math.random(),
       condition: condition
     };
-    var newValue = [].concat(_toConsumableArray(value), [condition]);
-    setValue(newValue);
+    var newValue = showList.map(function (item) {
+      return item.condition;
+    }).concat([condition]);
     setShowList([].concat(_toConsumableArray(showList), [newData]));
     props.onChange(newValue);
   }
@@ -128,6 +123,7 @@ var OrConditions = function OrConditions(props) {
 
   function changeData(type, id, newData) {
     var newValue = [];
+    console.log(type, id, newData);
     showList.forEach(function (data) {
       if (id === data.id) {
         if (type === 'period') {
@@ -159,7 +155,6 @@ var OrConditions = function OrConditions(props) {
     var newValue = newList.map(function (item) {
       return item.condition;
     });
-    setValue(newValue);
     props.onChange(newValue);
   }
 
@@ -214,11 +209,11 @@ var OrConditions = function OrConditions(props) {
         runPeriod: condition.runPeriod
       });
     } else if (util.isNumber(condition.eventId)) {
-      conditionDom = /*#__PURE__*/React.createElement(EventCondition, {
+      conditionDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EventCondition, {
         dataId: id,
         onChange: onChangeEvent,
         condition: condition
-      });
+      }));
     }
 
     return /*#__PURE__*/React.createElement(ConditionWrap, {

package/es/userCondition/styles/index.less

@@ -6,7 +6,7 @@
     display: flex;
     .biz-user-condition-and-conditions-wrap {
       flex: 1;
-      margin-bottom: @margin-md;
+      margin-bottom: @margin-lg;
       &.text-mode {
         display: flex;
         flex-wrap: wrap;

package/es/userCondition/styles/orConditions.less

@@ -1,6 +1,8 @@
 @import '../../assets/styles/variable.less';
 .biz-user-condition-or {
-  margin-bottom: @margin-md;
+  &:not(:last-child) {
+    margin-bottom: @margin-md;
+  }
   &.text-mode {
     display: flex;
     min-width: 0;
@@ -17,10 +19,13 @@
   &-content {
     display: flex;
     width: 100%;
-    margin-bottom: @margin-md;
+
     background: #ffffff;
     border: 1px solid @border-color-base;
     border-radius: @border-radius-small;
+    &:not(:last-child) {
+      margin-bottom: @margin-md;
+    }
     .biz-user-condition-conditions {
       flex: 1;
       padding: @padding-xs @padding-md 0 0;

package/es/userCondition/styles/relationLabel.less

@@ -1,9 +1,9 @@
-@import '../../commonStyle/variable.less';
+@import '../../assets/styles/inner.less';
 .biz-user-condition-relation {
   position: relative;
   width: 2px;
   margin-right: 30px;
-  background-color: @hoverBgColor;
+  background-color: @border-color-split;
   &-label {
     position: absolute;
     top: 50%;
@@ -12,7 +12,8 @@
     height: 24px;
     line-height: 24px;
     text-align: center;
-    background-color: @hoverBgColor;
+    background-color: @border-color-split;
+    border-radius: @border-radius-small;
     transform: translate(-50%, -50%);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.15-user.1",
+  "version": "1.0.15-user.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -53,6 +53,7 @@
     "@types/qs": "^6.9.7",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
+    "@zgfe/business-lib": "^1.0.15-user.4",
     "antd": "^4.19.2",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -61,5 +62,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "508ba3614c7cbbdefb822255f4c0233cc855a50e"
+  "gitHead": "aff9d9eccf24c422f39720b228495fd7f5947c5d"
 }