@zgfe/business-lib 1.1.69-beta.0 → 1.1.69-beta.2

package/es/attrCondition/styles/index.less

@@ -1,7 +1,7 @@
 @import '../../assets/styles/inner.less';
 .biz-attr-condition {
   gap: 16px !important;
-  align-items: flex-start;
+  align-items: flex-start !important;
   width: 100%;
   &-btn-del {
     color: #9aa1a9;

package/es/formulaTarget/components/panel/data.d.ts

@@ -1,8 +1,9 @@
 import { AttrConditionTypes } from '../../..';
 import { AnalysisEvent, EventGroup } from '../../../attributeSelector/types';
+import { FormulaTypes } from './types';
 export declare const leftMenu: {
     name: string;
-    value: string;
+    value: FormulaTypes;
 }[];
 export declare const filterData: AttrConditionTypes.GroupValue;
 export declare const getEventList: (eventGroupList?: EventGroup[]) => AnalysisEvent[];

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

@@ -1,12 +1,13 @@
+import { FormulaTypes } from './types';
 export var leftMenu = [{
   name: '事件',
-  value: 'event'
+  value: FormulaTypes.EVENT
 }, {
   name: '整体',
-  value: 'whole'
+  value: FormulaTypes.WHOLE
 }, {
   name: '常数',
-  value: 'constant'
+  value: FormulaTypes.CONSTANT
 }];
 export var filterData = {
   relation: 'and',

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

@@ -19,12 +19,13 @@ import { BuiltinIndicators } from '../../../constants/common';
 import { InfiniteScrollList } from '../../../eventSelector/listPanel';
 import PanelItem from './item';
 import { validator } from '../formula/util';
+import { FormulaTypes } from './types';
 import { BizValidatorContext } from '../../../context';
 export var classPrefix = 'formula-panel';
 var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList;
-  var _useState = useState('event'),
+  var _useState = useState(FormulaTypes.EVENT),
     _useState2 = _slicedToArray(_useState, 2),
     type = _useState2[0],
     setType = _useState2[1];
@@ -57,7 +58,7 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       whole: BuiltinIndicators.eventList
     });
     setCurrentValue(props.value);
-    setType(props.value ? props.value.type ? props.value.type : 'constant' : 'event');
+    setType(props.value ? getParentType(props.value.type) : FormulaTypes.EVENT);
     setTimeout(function () {
       setLoading(false);
     }, 0);
@@ -65,13 +66,17 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   useEffect(function () {
     props.onChange && props.onChange(currentValue);
   }, [currentValue]);
+  var getParentType = function getParentType(type) {
+    if (!type) return FormulaTypes.CONSTANT;
+    return type === FormulaTypes.EVENT ? FormulaTypes.EVENT : FormulaTypes.WHOLE;
+  };
   var onClickMenu = function onClickMenu(data) {
     setType(data);
   };
   var onClick = function onClick(data) {
     setValidateData('');
     setCurrentValue({
-      type: type,
+      type: data.isBuiltIn ? data.type : type,
       eventId: data.id,
       eventName: data.alias || data.name,
       alias: data.alias || data.name,
@@ -96,7 +101,6 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onSubmit = function onSubmit() {
     var conditionType = currentValue && currentValue.type ? currentValue.type : type;
     var data = validator(conditionType, currentValue);
-    console.log('submit:', data, conditionType, currentValue);
     if (!data.isOk) {
       setValidateData(data.msg);
       setValidate && setValidate(true);
@@ -119,7 +123,7 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         return onClickMenu(item.value);
       }
     }, item.name);
-  })), currentValue && currentValue.eventId && currentValue.type === type ? /*#__PURE__*/React.createElement(PanelItem, {
+  })), currentValue && currentValue.eventId && getParentType(currentValue.type) === type ? /*#__PURE__*/React.createElement(PanelItem, {
     value: currentValue,
     onBack: function onBack() {
       return setCurrentValue(null);
@@ -127,10 +131,10 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onChange: onChangeFilter
   }) : /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right")
-  }, type === 'event' && allList[type] && allList[type].length ? /*#__PURE__*/React.createElement(BizSearchInput, {
+  }, type === FormulaTypes.EVENT && allList[type] && allList[type].length ? /*#__PURE__*/React.createElement(BizSearchInput, {
     className: "".concat(classPrefix, "-right-search"),
     onChange: setSearchValue
-  }) : null, type === 'constant' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InputNumber, {
+  }) : null, type === FormulaTypes.CONSTANT ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InputNumber, {
     className: "".concat(classPrefix, "-right-number"),
     value: typeof currentValue === 'string' || typeof currentValue === 'number' ? Number(currentValue) : undefined,
     min: 0,

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

@@ -47,7 +47,7 @@
       .__select-option();
     }
 
-    &-number {
+    &-number.ant-input-number {
       min-width: 184px;
       background-color: @background-color-base;
       border: 1px solid @background-color-base;

package/es/formulaTarget/components/panel/types.d.ts

@@ -11,3 +11,8 @@ export interface PanelItemProps {
     onBack?: () => void;
     onChange?: (dimension: TargetConditionTypes.DimensionValue, filters?: AttrConditionTypes.GroupValue) => void;
 }
+export declare enum FormulaTypes {
+    EVENT = "event",
+    WHOLE = "whole",
+    CONSTANT = "constant"
+}

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

@@ -1 +1,6 @@
-export {};
+export var FormulaTypes;
+(function (FormulaTypes) {
+  FormulaTypes["EVENT"] = "event";
+  FormulaTypes["WHOLE"] = "whole";
+  FormulaTypes["CONSTANT"] = "constant";
+})(FormulaTypes || (FormulaTypes = {}));

package/es/formulaTarget/index.js

@@ -24,11 +24,12 @@ var defaultValue = {
   eventName: '自定义指标'
 };
 var BizFormulaTarget = function BizFormulaTarget(props) {
+  var _props$value;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isEdit = _useState2[0],
     setIsEdit = _useState2[1];
-  var _useState3 = useState(),
+  var _useState3 = useState(((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.eventName) || defaultValue.eventName),
     _useState4 = _slicedToArray(_useState3, 2),
     temporaryName = _useState4[0],
     setTemporaryName = _useState4[1];
@@ -85,7 +86,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     return flag;
   };
   var onCancelChangeName = function onCancelChangeName() {
-    setTemporaryName(condition === null || condition === void 0 ? void 0 : condition.eventName);
+    setTemporaryName((condition === null || condition === void 0 ? void 0 : condition.eventName) || defaultValue.eventName);
     setIsEdit(false);
     setNameError('');
   };

package/es/layout/columnLayout/demo/index.js

@@ -76,7 +76,8 @@ export default (function () {
   }, "Submit")))));
   return /*#__PURE__*/React.createElement("div", {
     style: {
-      boxShadow: '0px 4px 10px 0px rgba(0, 0, 0, 0.10)'
+      boxShadow: '0px 4px 10px 0px rgba(0, 0, 0, 0.10)',
+      background: '#fafafb'
     }
   }, /*#__PURE__*/React.createElement(BizLayout, {
     title: "\u6D1E\u5BDF",

package/es/layout/columnLayout/index.js

@@ -27,6 +27,8 @@ var BizLayout = function BizLayout(props) {
     className: "".concat(classPrefix, "-title")
   }, props.title) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-top-container")
   }, /*#__PURE__*/React.createElement("div", {
     ref: collapseRef
   }, props.topPanel), props.hasCollapse ? /*#__PURE__*/React.createElement("div", {
@@ -35,7 +37,7 @@ var BizLayout = function BizLayout(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     className: isOpen ? 'transform180' : '',
     type: "xiangxia"
-  }), ' ', /*#__PURE__*/React.createElement("span", null, isOpen ? '收起' : '展开')) : null), /*#__PURE__*/React.createElement("div", {
+  }), ' ', /*#__PURE__*/React.createElement("span", null, isOpen ? '收起' : '展开')) : null)), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
   }, props.children));
 };

package/es/layout/columnLayout/index.less

@@ -1,7 +1,6 @@
 @import '../../assets/styles/inner.less';
 
 .biz-layout {
-  background: #fafafb;
   &-title {
     display: flex;
     align-items: center;
@@ -15,11 +14,14 @@
   }
 
   &-top {
-    margin: 16px 24px;
-    padding-top: 24px;
-    background-color: #fff;
-    border: 1px solid #ecedf0;
-    border-radius: 8px;
+    padding: 16px 24px;
+    background: #fafafb;
+    &-container {
+      padding-top: 24px;
+      background-color: #fff;
+      border: 1px solid #ecedf0;
+      border-radius: 8px;
+    }
   }
 
   &-collapse-handle {

package/es/layout/optionTitle/styles/index.less

@@ -21,4 +21,10 @@
       .__default-hover();
     }
   }
+
+  &-content {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.69-beta.0",
+  "version": "1.1.69-beta.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f6fb9c2f96cbb4c40941f97b66330f9dc3fffd95"
+  "gitHead": "e93527cb913d4800234df4c963a21bdeb8195a79"
 }