@zgfe/business-lib 1.1.67-beta.3 → 1.1.67-beta.5

package/es/assets/styles/chunks.less

@@ -140,14 +140,13 @@
 
 // 下拉框常用样式
 .__select-normal-secondary {
+  background: @white;
   border: 1px solid @border-color-base;
   border-radius: @border-radius-small;
-
   &:not(.disable) {
     &:hover,
     &.active {
-      border-color: @border-color-base;
-      box-shadow: none;
+      border-color: @primary-color;
     }
   }
 }

package/es/assets/styles/resetAntd.less

@@ -74,6 +74,7 @@
 }
 
 .ant-select {
+  background: #fafafb;
   border: 1px solid #fafafb;
   border-radius: 2px;
   &:hover {
@@ -533,7 +534,8 @@
 }
 
 //dropdown
-.ant-dropdown {
+.ant-dropdown,
+.ant-dropdown-menu-submenu-popup {
   z-index: 6666 !important;
 }
 //message

package/es/eventSelector/index.js

@@ -28,7 +28,8 @@ var BizEventSelector = function BizEventSelector(props) {
     visible = _useState4[0],
     setVisible = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList;
+    _useContext$eventGrou = _useContext.eventGroupList,
+    eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou;
   var selectId = (Math.random() + 10).toString();
   useEffect(function () {
     if (!props.defaultValue) return;

package/es/formulaTarget/components/formula/util.js

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import _ from 'lodash';
-import { normalOptions } from '../../../targetConditionGroup/data/operates';
+import { attrOptions, normalOptions } from '../../../targetConditionGroup/data/operates';
 import { util } from '../../../utils';
 import { formulaDimensions, formulaList } from './data';
 export var newItem = {
@@ -168,7 +168,7 @@ export var validator = function validator(type, condition) {
 };
 export var getDimension = function getDimension(data, eId, eventGroupList) {
   var name = '';
-  normalOptions.forEach(function (item) {
+  normalOptions.concat(attrOptions).forEach(function (item) {
     if (item.value === data.analysisIndex) {
       name = item.label;
     }
@@ -178,8 +178,8 @@ export var getDimension = function getDimension(data, eId, eventGroupList) {
       group.eventList.forEach(function (event) {
         if (event.id === eId) {
           event.attrList.forEach(function (attr) {
-            if (String(attr.id) === data.analysisAttr) {
-              name += attr.alias || attr.label;
+            if (attr.label === data.analysisAttr) {
+              name = attr.label + name;
             }
           });
           return;

package/es/formulaTarget/components/formulaItem/index.js

@@ -173,7 +173,6 @@ var FormulaItem = function FormulaItem(props) {
     className: "".concat(classPrefix, "-target-handle"),
     onClick: onClickHandle
   }, /*#__PURE__*/React.createElement(SelectHandle, {
-    border: false,
     label: label
   }, /*#__PURE__*/React.createElement("span", null, label), haveFilter ? /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-target-handle-icon"),

package/es/formulaTarget/components/panel/index.js

@@ -135,6 +135,9 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     value: typeof currentValue === 'string' || typeof currentValue === 'number' ? Number(currentValue) : undefined,
     min: 0,
     max: 99999,
+    parser: function parser(value) {
+      return Number(value ? value.replace(/^(\d+)\.(\d\d).*/, '$1.$2') : '');
+    },
     status: validateData ? 'error' : '',
     onChange: onChangeConstant
   }), /*#__PURE__*/React.createElement("div", {

package/es/formulaTarget/components/panel/index.less

@@ -123,6 +123,12 @@
     .ant-btn:not(:last-child) {
       margin-right: 16px;
     }
+    .ant-btn-text {
+      &:hover {
+        color: @error-color !important;
+        background: #f2f3f4 !important;
+      }
+    }
   }
 
   &-error {

package/es/formulaTarget/demo/group.js

@@ -69,6 +69,7 @@ export default (function () {
       return /*#__PURE__*/React.createElement(Form.Item, _objectSpread(_objectSpread({}, field), {}, {
         key: field.key
       }), /*#__PURE__*/React.createElement(BizFormulaTarget, {
+        enableDelete: fields.length > 1,
         onDelete: function onDelete() {
           if (fields.length > 1) {
             remove(field.name);

package/es/formulaTarget/demo/index.js

@@ -15,6 +15,10 @@ export default (function () {
       padding: 20
     }
   }, /*#__PURE__*/React.createElement(BizFormulaTarget, {
+    value: {
+      type: 'custom',
+      eventName: '自定义指标'
+    },
     onChange: onChange,
     onDelete: onDelete
   })));

package/es/formulaTarget/index.js

@@ -10,52 +10,47 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useRef, useState } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 import './styles/index.less';
 import { Input, Popconfirm } from 'antd';
 import IconFont from '../icon/iconFont';
 import FormulaContainer from './components/formula';
 import { validatorFormula } from './components/formula/util';
+import _ from 'lodash';
 var classPrefix = 'biz-formula-target';
 var defaultValue = {
   type: 'custom',
   eventName: '自定义指标'
 };
 var BizFormulaTarget = function BizFormulaTarget(props) {
-  var _props$value, _props$value2;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isEdit = _useState2[0],
     setIsEdit = _useState2[1];
-  var _useState3 = useState(true),
+  var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
-    isNormal = _useState4[0],
-    setIsNormal = _useState4[1];
-  var _useState5 = useState(((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.eventName) || defaultValue.eventName),
+    temporaryName = _useState4[0],
+    setTemporaryName = _useState4[1];
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
-    name = _useState6[0],
-    setName = _useState6[1];
-  var _useState7 = useState(((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.eventName) || defaultValue.eventName),
+    nameError = _useState6[0],
+    setNameError = _useState6[1];
+  var _useState7 = useState(props.value || defaultValue),
     _useState8 = _slicedToArray(_useState7, 2),
-    temporaryName = _useState8[0],
-    setTemporaryName = _useState8[1];
-  var _useState9 = useState(''),
+    condition = _useState8[0],
+    setCondition = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    nameError = _useState10[0],
-    setNameError = _useState10[1];
-  var _useState11 = useState(props.value || defaultValue),
+    open = _useState10[0],
+    setOpen = _useState10[1];
+  var _useState11 = useState(''),
     _useState12 = _slicedToArray(_useState11, 2),
-    condition = _useState12[0],
-    setCondition = _useState12[1];
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    open = _useState14[0],
-    setOpen = _useState14[1];
-  var _useState15 = useState(''),
-    _useState16 = _slicedToArray(_useState15, 2),
-    errorMsg = _useState16[0],
-    setErrorMsg = _useState16[1];
+    errorMsg = _useState12[0],
+    setErrorMsg = _useState12[1];
   var formulaRef = useRef(null);
+  var contentChange = useMemo(function () {
+    return !_.isEqual(props.value, condition);
+  }, [props.value, condition]);
   var onChangeTemporaryName = function onChangeTemporaryName(e) {
     var name = e.target.value;
     setTemporaryName(name);
@@ -67,7 +62,12 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
   };
   var onChangeName = function onChangeName() {
     if (!validatorName(temporaryName)) return;
-    setName(temporaryName);
+    setCondition(function (data) {
+      return _objectSpread(_objectSpread({}, data), {}, {
+        eventName: temporaryName,
+        alias: temporaryName
+      });
+    });
     setIsEdit(false);
   };
   var validatorName = function validatorName(name) {
@@ -76,8 +76,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     if (!name) {
       msg = '指标名称不能为空';
       flag = false;
-    }
-    if (props.disableNames && props.disableNames.includes(name)) {
+    } else if (props.disableNames && props.disableNames.includes(name)) {
       msg = '指标名称不能重复';
       flag = false;
     }
@@ -85,60 +84,55 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     return flag;
   };
   var onCancelChangeName = function onCancelChangeName() {
-    setTemporaryName(name);
+    setTemporaryName(condition === null || condition === void 0 ? void 0 : condition.eventName);
     setIsEdit(false);
     setNameError('');
   };
   var onSave = function onSave() {
-    if (!validatorName(name)) return;
+    if (!validatorName(condition.eventName)) return;
     var validateData = validatorFormula(condition);
     if (!validateData.isOk) {
       setErrorMsg(validateData.msg);
       setOpen(true);
       return;
     }
-    setIsNormal(true);
-    props.onChange && props.onChange(_objectSpread(_objectSpread({}, condition), {}, {
-      type: 'custom',
-      alias: name,
-      eventName: name
-    }));
+    props.onChange && props.onChange(condition);
   };
   var onDelete = function onDelete(e) {
     e.stopPropagation();
-    if (!props.enableDelete) return;
+    if (!props.enableDelete && !contentChange) return;
     props.onDelete && props.onDelete();
   };
   var onCancel = function onCancel(e) {
     e.stopPropagation();
     if (!props.value || !props.value.customCondition || !props.value.customCondition.length) {
-      if (!props.enableDelete) return;
+      if (!props.enableDelete && !contentChange) return;
       props.onDelete && props.onDelete();
     } else {
-      var _props$value3;
       setCondition(props.value || defaultValue);
-      setName(((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.eventName) || defaultValue.eventName);
       setTimeout(function () {
         formulaRef.current.reset();
       }, 0);
     }
-    setIsNormal(true);
   };
   var onChange = function onChange(customCondition, formula, resultFormat) {
     setCondition(function (value) {
-      return _objectSpread(_objectSpread({}, value || {
-        eventName: name
-      }), {}, {
+      return _objectSpread(_objectSpread({}, value), {}, {
         customCondition: customCondition,
         formula: formula,
         resultFormat: resultFormat
       });
     });
-    setIsNormal(false);
   };
   var onClose = function onClose() {
     setOpen(false);
   };
+  var handleOpenChange = function handleOpenChange(newOpen) {
+    if (!newOpen) {
+      setOpen(newOpen);
+      return;
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -149,14 +143,14 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     className: "".concat(classPrefix, "-title-content")
   }, isEdit ? /*#__PURE__*/React.createElement(Input, {
     className: "".concat(classPrefix, "-title-input").concat(isEdit ? ' focused' : ''),
-    defaultValue: name,
+    defaultValue: condition.eventName,
     autoFocus: true,
     maxLength: 20,
     status: nameError ? 'error' : '',
     placeholder: "\u8BF7\u8F93\u5165",
     onChange: onChangeTemporaryName
-  }) : /*#__PURE__*/React.createElement("span", null, name)), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-title-option").concat(isEdit || !isNormal ? ' show' : '')
+  }) : /*#__PURE__*/React.createElement("span", null, condition.eventName)), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-title-option").concat(isEdit || contentChange ? ' show' : '')
   }, isEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "primary",
     onClick: onChangeName
@@ -168,11 +162,14 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     onClick: function onClick() {
       return setIsEdit(true);
     }
-  }), /*#__PURE__*/React.createElement(Popconfirm, {
+  }), contentChange ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popconfirm, {
     title: errorMsg,
     open: open,
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88",
     onCancel: onClose,
-    onConfirm: onClose
+    onConfirm: onClose,
+    onOpenChange: handleOpenChange
   }, /*#__PURE__*/React.createElement("div", {
     className: "primary",
     onClick: onSave
@@ -180,8 +177,8 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     onClick: function onClick(e) {
       return onCancel(e);
     }
-  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement("div", {
-    className: "delete".concat(!props.enableDelete ? ' disable' : ''),
+  }, "\u53D6\u6D88")) : null, /*#__PURE__*/React.createElement("div", {
+    className: "delete".concat(!props.enableDelete && !contentChange ? ' disable' : ''),
     onClick: function onClick(e) {
       return onDelete(e);
     }

package/es/formulaTarget/styles/index.less

@@ -6,6 +6,10 @@
     .biz-formula-target-title-option {
       display: flex;
     }
+    .formula-container-option:not(.active) {
+      display: flex;
+      color: #b9ceff;
+    }
   }
 
   &-title {
@@ -45,13 +49,12 @@
       }
 
       &-icon {
-        margin-left: 8px;
+        margin: 0 8px;
         font-size: 16px !important;
         cursor: pointer;
       }
 
       .primary {
-        margin-left: 8px;
         color: @primary-color;
       }
       .disable {

package/es/targetConditionGroup/index.js

@@ -52,7 +52,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     count = _useState12[0],
     setCount = _useState12[1];
-  var _useState13 = useState(true),
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
     isAdd = _useState14[0],
     setIsAdd = _useState14[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.67-beta.3",
+  "version": "1.1.67-beta.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "60b424a819cbf1465a05510288a93b9cda0b67d0"
+  "gitHead": "0018cf63a30f25d3dfdfebff55931beeb23d77ef"
 }