@zgfe/business-lib 1.0.21 → 1.0.22-bugfix.2

package/es/addToPanel/components/addPanel.js

@@ -18,9 +18,9 @@ var inputOptions = [{
   label: '公开',
   value: 1
 }, {
-  label: '指定人员明显',
+  label: '指定人员可见',
   value: 2,
-  title: '通过看板的共享功能指定可见成员'
+  title: '通过看板的共享功能指定可见人员'
 }, {
   label: '仅自己可见',
   value: 3

package/es/assets/styles/chunks.less

@@ -129,8 +129,6 @@
 
 // 下拉框常用样式
 .__select-normal-secondary {
-  height: @height-base;
-  line-height: @height-base;
   background-color: @white;
   border: 1px solid @border-color-base;
   border-radius: @border-radius-small;

package/es/attrConditions/components/operateList.js

@@ -81,6 +81,7 @@ var BizOperateList = function BizOperateList(props) {
     keyField: "value",
     theme: props.theme,
     options: options,
+    size: "middle",
     onChange: onChange
   });
 };

package/es/attrConditions/components/valuesList.js

@@ -120,6 +120,7 @@ var ValuesList = function ValuesList(props) {
       disable: true,
       className: "".concat(classPrefix, "-multi-select"),
       theme: theme,
+      size: "middle",
       options: []
     });
   }
@@ -139,6 +140,7 @@ var ValuesList = function ValuesList(props) {
       },
       keyField: "value",
       labelField: "label",
+      size: "middle",
       theme: props.theme,
       className: "".concat(classPrefix, "-input-select"),
       onChange: onChangeUnit,
@@ -151,6 +153,7 @@ var ValuesList = function ValuesList(props) {
       value: current && current.length ? current[0] : '',
       placeholder: "\u8BF7\u8F93\u5165",
       type: "number",
+      size: "middle",
       onChange: onChangeNumber,
       suffix: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : null
     }), attr.propCategory === 'userProp' && attr.subtype === 2 && numberAfter);

package/es/attributeSelector/demo/disable.d.ts

@@ -0,0 +1,3 @@
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/es/attributeSelector/demo/disable.js

@@ -0,0 +1,64 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useState } from 'react';
+import { BizAttributeSelector, BizGlobalDataContext } from '@zgfe/business-lib';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+import eventData from '../../mock/event';
+import envData from '../../mock/env';
+import userData from '../../mock/user';
+import convertAttributeData from '../util';
+export default (function () {
+  var _useState = useState({
+    id: 30183426,
+    propCategory: 'eventProp'
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      attribute = _useState2[0],
+      setAttribute = _useState2[1];
+
+  var store = convertAttributeData({
+    eventList: eventData,
+    userPropList: userData,
+    envPropList: envData
+  });
+
+  function onChange(val) {
+    setAttribute(val);
+  }
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, "\u9009\u62E9\u7684\u5C5E\u6027\u662F\uFF1A", JSON.stringify(attribute)), /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
+    value: {
+      eventGroupList: store.eventGroupList,
+      userPropList: store.userPropList,
+      eventEnvList: store.envPropList
+    }
+  }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+    enableEventProp: true,
+    enableUserProp: true,
+    eventIdList: [24143016],
+    value: attribute,
+    onChange: onChange,
+    enableDelete: true,
+    disableItemList: [{
+      propCategory: 'eventProp',
+      id: 30183426
+    }, {
+      name: 'is_anonymous',
+      propCategory: 'userProp'
+    }, {
+      name: 'browser_version',
+      propCategory: 'envProp'
+    }],
+    enableEnvProp: true
+  })));
+});

package/es/attributeSelector/demo/index.js

@@ -49,16 +49,6 @@ export default (function () {
     value: attribute,
     onChange: onChange,
     enableDelete: true,
-    disableItemList: [{
-      propCategory: 'eventProp',
-      id: 30183426
-    }, {
-      name: 'is_anonymous',
-      propCategory: 'userProp'
-    }, {
-      name: 'browser_version',
-      propCategory: 'envProp'
-    }],
     enableEnvProp: true
   })));
 });

package/es/attributeSelector/index.js

@@ -131,6 +131,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     ref: boxRef,
     theme: theme,
     border: false,
+    size: props.size,
     label: currentAttr === null || currentAttr === void 0 ? void 0 : currentAttr.label,
     placeholder: placeholder
   }))), enableDelete && /*#__PURE__*/React.createElement(Tooltip, {
@@ -148,6 +149,7 @@ BizAttributeSelector.defaultProps = {
   enableDelete: false,
   placeholder: '请选择',
   theme: 'secondary',
+  size: 'middle',
   propSymbol: '*',
   optionsHeaderTip: '带＊的属性每日凌晨更新',
   destroyPopupOnHide: false

package/es/attributeSelector/types.d.ts

@@ -1,3 +1,4 @@
+import { SizeType } from 'antd/es/config-provider/SizeContext';
 import { ReactNode } from 'react';
 export declare enum PropType {
     STRING = 1,
@@ -79,6 +80,7 @@ export declare namespace AttributeSelect {
         onDelete?: (value?: Value) => void;
         theme?: string;
         destroyPopupOnHide?: boolean;
+        size?: SizeType;
     }
     interface Option {
         groupName: string;

package/es/attributeSelector/util.js

@@ -47,7 +47,7 @@ export default function convertAttributeData(store) {
       id: prop.id || 0,
       alias: prop.alias_name,
       category: prop.category,
-      key: "envProp-".concat(prop.dimension_sub, "-").concat(prop.id || 0),
+      key: "envProp-".concat(prop.dimension_sub),
       label: prop.text,
       name: prop.name,
       propCategory: 'envProp',
@@ -61,7 +61,7 @@ export default function convertAttributeData(store) {
       id: prop.id || 0,
       alias: prop.alias_name,
       category: prop.category,
-      key: "userProp-".concat(prop.dimension_sub, "-").concat(prop.id || 0),
+      key: "userProp-".concat(prop.dimension_sub),
       label: prop.text || prop.name,
       name: prop.name,
       propCategory: 'userProp',

package/es/datePicker/index.js

@@ -121,4 +121,7 @@ var BizDatePicker = function BizDatePicker(props) {
   })));
 };
 
+BizDatePicker.defaultProps = {
+  includeToday: true
+};
 export default BizDatePicker;

package/es/dnd/demo/index.d.ts

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

package/es/dnd/demo/index.js

@@ -0,0 +1,4 @@
+import React from 'react';
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", null, "dnd demo");
+});

package/es/dnd/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const BizDnd: React.FC;
+export default BizDnd;

package/es/dnd/index.js

@@ -0,0 +1,7 @@
+import React from 'react';
+
+var BizDnd = function BizDnd() {
+  return /*#__PURE__*/React.createElement("div", null, "dnd");
+};
+
+export default BizDnd;

package/es/dnd/types.d.ts

@@ -0,0 +1,8 @@
+export declare namespace DndTypes {
+    interface Props {
+        className?: string;
+        itemClassName?: string;
+        draddingClassName?: string;
+        tempClassName?: string;
+    }
+}

package/es/dnd/types.js

@@ -0,0 +1 @@
+export {};

package/es/eventSelector/index.js

@@ -151,7 +151,8 @@ var BizEventSelector = function BizEventSelector(props) {
     theme: theme,
     border: false,
     label: getLabel(),
-    placeholder: placeholder
+    placeholder: placeholder,
+    size: props.size
   }))));
 };
 
@@ -161,6 +162,7 @@ BizEventSelector.defaultProps = {
   popupContainer: true,
   border: true,
   theme: 'secondary',
+  size: 'middle',
   destroyPopupOnHide: false
 };
 export default BizEventSelector;

package/es/eventSelector/styles/index.less

@@ -11,7 +11,7 @@
     display: flex;
     flex-direction: row;
     width: 477px;
-    max-height: 400px;
+    height: 320px;
     padding: 0;
     .__select-panel();
   }

package/es/eventSelector/types.d.ts

@@ -1,3 +1,4 @@
+import { SizeType } from 'antd/es/config-provider/SizeContext';
 import { AnalysisEvent, EventGroup } from '../attributeSelector/types';
 export declare namespace EventSelectTypes {
     interface Value {
@@ -25,6 +26,7 @@ export declare namespace EventSelectTypes {
         onVisibleChange?: (visible: boolean) => void;
         border?: boolean;
         theme?: string;
+        size?: SizeType;
         destroyPopupOnHide?: boolean;
         onChange?: (val: Value) => void;
     }

package/es/select/index.js

@@ -182,7 +182,7 @@ var BizSelect = function BizSelect(props) {
     disable: props.disable,
     multiple: props.multiple,
     theme: props.theme,
-    size: props.size,
+    size: props.size || 'middle',
     border: props.border,
     onDelete: onDelete,
     onSearch: function onSearch(v) {

package/es/userCondition/conditions/periodCondition.js

@@ -107,7 +107,7 @@ var PeriodCondition = function PeriodCondition(props) {
 
     if (operator === 'relative' || operator === 'join_time') {
       return /*#__PURE__*/React.createElement(Input, {
-        size: "large",
+        size: "middle",
         value: values[0],
         onChange: onDateChange,
         style: {
@@ -118,7 +118,7 @@ var PeriodCondition = function PeriodCondition(props) {
 
     if (operator === 'absolute') {
       return /*#__PURE__*/React.createElement(RangePicker, {
-        size: "large",
+        size: "middle",
         defaultValue: [moment(values[0]), moment(values[1])],
         onChange: onDateChange,
         allowClear: false
@@ -142,6 +142,7 @@ var PeriodCondition = function PeriodCondition(props) {
     options: options,
     labelField: "text",
     keyField: "value",
+    size: "middle",
     value: {
       value: runPeriod.operator,
       text: operatorMap[runPeriod.operator]

package/es/userCondition/conditions/runTimesCondition.js

@@ -59,11 +59,12 @@ var RunTimesCondition = function RunTimesCondition(props) {
       value: runTimes.operator,
       text: runTimes.operator === 'not equal' ? '≠' : runTimes.operator
     },
+    size: "middle",
     onChange: onOperatorChange
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-runtimes-condition-value")
   }, /*#__PURE__*/React.createElement(Input, {
-    size: "large",
+    size: "middle",
     value: runTimes.values[0],
     onChange: onValueChange
   })), /*#__PURE__*/React.createElement("div", {

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

@@ -25,7 +25,7 @@
     align-items: center;
     justify-content: center;
     width: 38px;
-    height: 40px;
+    height: @height-base;
     margin-right: @margin-xs;
     margin-left: @border-radius-small;
     background-color: @background-color-gray;

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

@@ -26,8 +26,8 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 40px;
-      height: 40px;
+      width: @height-base;
+      height: @height-base;
       background-color: @background-color-gray;
       border-radius: @border-radius-sx;
       cursor: pointer;

package/es/userCondition/styles/index.less

@@ -22,12 +22,5 @@
     .biz-user-condition-and-conditions-empty {
       margin-bottom: 0;
     }
-    .biz-select-handle-input-multiple {
-      min-height: 40px;
-      padding: calc(@margin-xs - 2px) @margin-xs calc(@margin-xs - 2px) @margin-sm;
-      .biz-select-handle-holder {
-        line-height: 28px;
-      }
-    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.21",
+  "version": "1.0.22-bugfix.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "6c9d9789e4785d4fafbd8420e92657a48d95401e"
+  "gitHead": "f3ea834dcbec8fbd66d0a595a0af520dad61d225"
 }