@zgfe/business-lib 1.0.15-user.2 → 1.0.15-user.6

package/es/assets/theme.js

@@ -1,14 +1,24 @@
-export default {
-  'primary-color': '#165dff',
-  'border-color-base': '#ECEDF0',
-  'background-color-base': '#fafafb',
-  'text-color': '#021429',
-  'text-color-secondary': '#5f6085',
-  'tooltip-bg': '#242541',
-  'error-color': '#fb5547',
-  'shadow-color': 'rgba(0, 0, 0, 0.1)',
-  'box-shadow-base': '0px 4px 10px rgba(0, 0, 0, 0.1)',
-  'btn-text-hover-bg': '#cacdd4',
-  'warning-color': '#FD9F41',
-  'border-color-split': '#E8EFFF'
-};
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+(function (global, factory) {
+  (typeof exports === "undefined" ? "undefined" : _typeof(exports)) === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'], factory) : (global = global || self, factory(global.acorn = {}));
+})(this, function (exports) {
+  'use strict';
+
+  exports.theme = {
+    'primary-color': '#165dff',
+    'border-color-base': '#ECEDF0',
+    'background-color-base': '#fafafb',
+    'text-color': '#021429',
+    // 正文
+    'text-color-secondary': '#5f6085',
+    // 次要
+    'tooltip-bg': '#242541',
+    'error-color': '#fb5547',
+    'shadow-color': 'rgba(0, 0, 0, 0.1)',
+    'box-shadow-base': '0px 4px 10px rgba(0, 0, 0, 0.1)',
+    'btn-text-hover-bg': '#cacdd4',
+    'warning-color': '#FD9F41',
+    'border-color-split': '#E8EFFF'
+  };
+});

package/es/eventSelector/listPanel.js

@@ -133,6 +133,8 @@ var EventListPanel = function EventListPanel(props) {
   }
 
   function onClickGroup(g) {
+    setCurrentGroup(g);
+
     if (defaultSelectAble) {
       var resVal = _.cloneDeep(currentValue) || {};
       resVal.group = g;
@@ -145,14 +147,6 @@ var EventListPanel = function EventListPanel(props) {
     }
   }
 
-  function onHoverGroup(g) {
-    setCurrentGroup(g);
-  }
-
-  function onMouseLeaveGroup() {
-    setCurrentGroup(currentSelectGroup);
-  }
-
   if (!groupList || !groupList.length || !groupList[0].eventList || !groupList[0].eventList.length) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-nodata-panel")
@@ -174,9 +168,7 @@ var EventListPanel = function EventListPanel(props) {
       key: group.id || 'overview',
       checked: (currentSelectGroup === null || currentSelectGroup === void 0 ? void 0 : currentSelectGroup.id) === group.id,
       data: group,
-      onClick: onClickGroup,
-      onMouseOver: onHoverGroup,
-      onMouseLeave: onMouseLeaveGroup
+      onClick: onClickGroup
     });
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right")

package/es/eventSelector/option.d.ts

@@ -11,7 +11,5 @@ declare const EventListOption: React.FC<{
     };
     data?: any;
     onClick?: (data: any) => void;
-    onMouseOver?: (data: any) => void;
-    onMouseLeave?: (data: any) => void;
 }>;
 export default EventListOption;

package/es/eventSelector/option.js

@@ -16,14 +16,6 @@ var EventListOption = function EventListOption(props) {
     if (onClick) onClick(data);
   };
 
-  function onMouseOver() {
-    if (props.onMouseOver) props.onMouseOver(data);
-  }
-
-  function onMouseLeave() {
-    if (props.onMouseLeave) props.onMouseLeave(data);
-  }
-
   function getLabel(label) {
     if (!highlight || !highlight.enable || !highlight.text) return label;
     var text = highlight.text;
@@ -40,9 +32,7 @@ var EventListOption = function EventListOption(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option ").concat(checked ? 'active' : ''),
-    onClick: _onClick,
-    onMouseOver: onMouseOver,
-    onMouseLeave: onMouseLeave
+    onClick: _onClick
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option-label"),
     title: label

package/es/index.d.ts

@@ -14,7 +14,7 @@ import BizChart from './chart';
 import BizTable from './table';
 import IconFont from './icon/iconFont';
 import { util, ajax } from './utils';
-import theme from './assets/theme';
+import theme from './assets/theme.js';
 import convertAttributeData from './attributeSelector/util';
 import BizGlobalDataContext from './context';
 import BizUserCondition from './userCondition';

package/es/index.js

@@ -13,7 +13,7 @@ import BizChart from './chart';
 import BizTable from './table';
 import IconFont from './icon/iconFont';
 import { util, ajax } from './utils';
-import theme from './assets/theme';
+import theme from './assets/theme.js';
 import convertAttributeData from './attributeSelector/util';
 import BizGlobalDataContext from './context';
 import BizUserCondition from './userCondition';

package/es/select/demo/customLabel.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/es/select/demo/customLabel.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { BizSelect } from '@zgfe/business-lib';
+import userData from '../../mock/user';
+import convertAttributeData from '../../attributeSelector/util';
+export default (function () {
+  var store = convertAttributeData({
+    userPropList: userData
+  });
+
+  function renderLabel(node, option) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, node, option.realTime ? '*' : null);
+  }
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizSelect, {
+    options: store.userPropList,
+    customLabel: renderLabel,
+    labelField: "name",
+    keyField: "name",
+    theme: "secondary",
+    popupContainer: true,
+    enableSearch: true
+  }));
+});

package/es/select/option.js

@@ -8,7 +8,8 @@ var SelectOption = function SelectOption(props) {
       group = props.group,
       checked = props.checked,
       disabled = props.disabled,
-      multiple = props.multiple;
+      multiple = props.multiple,
+      customLabel = props.customLabel;
 
   function onClick() {
     if (disabled) return;
@@ -29,6 +30,11 @@ var SelectOption = function SelectOption(props) {
     });
   }
 
+  function renderLabel(option) {
+    var dom = getLabel(option[props.labelField]);
+    return customLabel ? customLabel(dom, option) : dom;
+  }
+
   if (group) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-group")
@@ -51,7 +57,7 @@ var SelectOption = function SelectOption(props) {
     className: "".concat(classPrefix, "-option-icon")
   }, option === null || option === void 0 ? void 0 : option.icon), /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-option-label")
-  }, getLabel(option[props.labelField])), !disabled && /*#__PURE__*/React.createElement("span", {
+  }, renderLabel(option)), !disabled && /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-option-btn")
   }, props.extra && props.extra(option)));
 };

package/es/select/overlay.js

@@ -25,7 +25,8 @@ var SelectOverlay = function SelectOverlay(props) {
       multiple = props.multiple,
       disableItemList = props.disableItemList,
       dropdownExtra = props.dropdownExtra,
-      loading = props.loading;
+      loading = props.loading,
+      customLabel = props.customLabel;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -116,7 +117,8 @@ var SelectOverlay = function SelectOverlay(props) {
         multiple: multiple,
         onClick: onClick,
         disabled: disabled,
-        key: option[keyField] || String(Math.random())
+        key: option[keyField] || String(Math.random()),
+        customLabel: customLabel
       });
       optionsDom.push(dom);
     });

package/es/select/types.d.ts

@@ -36,6 +36,7 @@ export declare namespace BizSelectTypes {
         onChange?: (val: Option) => void;
         onVisibleChange?: (visible: boolean) => void;
         destroyPopupOnHide?: boolean;
+        customLabel?: (node: ReactNode, option: Option) => ReactNode;
     }
     interface OverlayProps {
         option?: Option;
@@ -51,6 +52,7 @@ export declare namespace BizSelectTypes {
         labelField?: string;
         extra?: (option: Option) => ReactNode;
         onClick?: (option: Option) => void;
+        customLabel?: (node: ReactNode, option: Option) => ReactNode;
     }
 }
 export interface HandlerTypes {

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/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;

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

@@ -8,7 +8,7 @@
   &-unit {
     margin-right: @margin-xs;
     > input {
-      border: none;
+      border: none !important;
     }
   }
   &-operator {

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

@@ -10,7 +10,7 @@
     width: 58px;
     margin-right: @margin-xs;
     > input {
-      border: none;
+      border: none !important;
     }
   }
   .biz-user-condition-runtimes-tip {

package/es/userCondition/index.js

@@ -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/userTagsSelector/groups/groupOption.js

@@ -1,7 +1,7 @@
 import React, { forwardRef } from 'react';
 import { Badge } from 'antd';
 import { classPrefix } from '..';
-import theme from '../../assets/theme';
+import theme from '../../assets/theme.js';
 import './styles/option.less';
 import { util } from '../../utils';
 var GroupOption = /*#__PURE__*/forwardRef(function (props, ref) {

package/es/userTagsSelector/multipleCheckPanel/checkOption.js

@@ -2,7 +2,7 @@ import React, { forwardRef } from 'react';
 import { Checkbox } from 'antd';
 import { classPrefix } from '..';
 import { util } from '../../utils';
-import theme from '../../assets/theme';
+import theme from '../../assets/theme.js';
 import './styles/option.less';
 var CheckOption = /*#__PURE__*/forwardRef(function (props, ref) {
   var highlightText = props.highlightText,

package/package.json

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

package/es/assets/theme.d.ts

@@ -1,15 +0,0 @@
-declare const _default: {
-    'primary-color': string;
-    'border-color-base': string;
-    'background-color-base': string;
-    'text-color': string;
-    'text-color-secondary': string;
-    'tooltip-bg': string;
-    'error-color': string;
-    'shadow-color': string;
-    'box-shadow-base': string;
-    'btn-text-hover-bg': string;
-    'warning-color': string;
-    'border-color-split': string;
-};
-export default _default;