@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.1

package/es/datePickerV2/styles/index.less

@@ -1,194 +1,194 @@
-@import '../../assets/styles/inner.less';
-
-.biz-date-picker-old-wrap {
-  display: flex;
-
-  &-type {
-    width: 88px;
-  }
-
-  &-shortcut {
-    display: flex;
-  }
-
-  &-list {
-    display: flex;
-    // margin: 0 16px 0 0;
-
-    &-relative {
-      display: flex;
-      gap: 24px;
-      align-items: center;
-      margin-left: 16px;
-
-      &-content {
-        display: flex;
-        align-items: center;
-        span {
-          margin: 0 8px;
-        }
-
-        .ant-input-number {
-          background-color: #fff !important;
-          border: 1px solid var(---, #ecedf0);
-          border-radius: 4px;
-        }
-      }
-    }
-  }
-
-  .biz-select-handle {
-    margin-right: 8px;
-    padding: 0;
-  }
-
-  &-item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 58px;
-    height: @height-base;
-    color: @text-color-secondary;
-    border: 1px solid @border-color-base;
-    cursor: pointer;
-
-    &:first-child {
-      border-radius: @border-radius-small 0px 0px @border-radius-small;
-    }
-
-    &:last-child {
-      border-radius: 0px @border-radius-small @border-radius-small 0px;
-    }
-
-    &:not(:last-child) {
-      border-right: none;
-    }
-
-    &:hover {
-      .__default-hover();
-      border-color: @border-color-base;
-    }
-
-    &.active {
-      color: @primary-color;
-      background: @primary-color-hover;
-      border: 1px solid @primary-color;
-    }
-  }
-
-  &-input {
-    display: flex;
-    flex-shrink: 0;
-    gap: 4px;
-    align-items: center;
-    justify-content: space-between;
-    width: 262px;
-    padding: 0px 12px;
-    font-size: 14px;
-    background: #fff;
-    border: 1px solid var(---, #ecedf0);
-    border-radius: 4px;
-
-    &-label {
-      display: flex;
-      gap: 4px;
-      align-items: center;
-    }
-
-    &:hover {
-      // color: #165dff;
-      border-color: @primary-color;
-      cursor: pointer;
-    }
-
-    &:focus {
-      border-color: @primary-color;
-    }
-
-    &:active {
-      border-color: @primary-color;
-    }
-
-    &-active {
-      border-color: @primary-color;
-      box-shadow: 0 0 0 4px #f0f7ff;
-    }
-
-    &-popover {
-      padding-top: 0 !important;
-      .ant-popover-arrow {
-        display: none;
-      }
-
-      .ant-popover-inner-content {
-        padding: 0 16px 16px;
-      }
-
-      .ant-picker-dropdown {
-        padding-top: 0;
-
-        .ant-picker-range-arrow {
-          display: none;
-        }
-      }
-
-      .ant-tabs-top > .ant-tabs-nav::before {
-        border-bottom: 1px solid #fafafb;
-      }
-
-      .ant-tabs-tab {
-        padding: 12px 0 !important;
-        font-size: 14px !important;
-      }
-
-      .ant-popover-inner {
-        background: #fff;
-        border-radius: 8px;
-        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-      }
-    }
-
-    &-error {
-      position: relative;
-      border: 1px solid var(--io-Error-E-, #fb5547) !important;
-
-      &::after {
-        position: absolute;
-        width: 67px;
-        color: red;
-        font-size: 12px;
-        content: '请输入内容';
-      }
-    }
-  }
-
-  &-panel {
-    & div:last-of-type {
-      position: relative !important;
-    }
-    .biz-date-picker-old-wrap-drop {
-      top: 0 !important;
-      margin-top: 12px;
-      padding: 0;
-    }
-    .ant-picker-panel-container {
-      background: #fff;
-      border: 1px solid var(--io-n-02, #f2f3f4);
-      border-radius: 10px;
-      box-shadow: none;
-    }
-
-    .ant-picker-panel-container .ant-picker-panel-focused {
-      border-color: var(--io-n-02, #f2f3f4);
-    }
-  }
-
-  &-popoverContent-btns {
-    position: absolute;
-    top: 0;
-    right: 0;
-    display: flex;
-    gap: 16px;
-    justify-content: flex-end;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-date-picker-old-wrap {
+  display: flex;
+
+  &-type {
+    width: 88px;
+  }
+
+  &-shortcut {
+    display: flex;
+  }
+
+  &-list {
+    display: flex;
+    // margin: 0 16px 0 0;
+
+    &-relative {
+      display: flex;
+      gap: 24px;
+      align-items: center;
+      margin-left: 16px;
+
+      &-content {
+        display: flex;
+        align-items: center;
+        span {
+          margin: 0 8px;
+        }
+
+        .ant-input-number {
+          background-color: #fff !important;
+          border: 1px solid var(---, #ecedf0);
+          border-radius: 4px;
+        }
+      }
+    }
+  }
+
+  .biz-select-handle {
+    margin-right: 8px;
+    padding: 0;
+  }
+
+  &-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 58px;
+    height: @height-base;
+    color: @text-color-secondary;
+    border: 1px solid @border-color-base;
+    cursor: pointer;
+
+    &:first-child {
+      border-radius: @border-radius-small 0px 0px @border-radius-small;
+    }
+
+    &:last-child {
+      border-radius: 0px @border-radius-small @border-radius-small 0px;
+    }
+
+    &:not(:last-child) {
+      border-right: none;
+    }
+
+    &:hover {
+      .__default-hover();
+      border-color: @border-color-base;
+    }
+
+    &.active {
+      color: @primary-color;
+      background: @primary-color-hover;
+      border: 1px solid @primary-color;
+    }
+  }
+
+  &-input {
+    display: flex;
+    flex-shrink: 0;
+    gap: 4px;
+    align-items: center;
+    justify-content: space-between;
+    width: 262px;
+    padding: 0px 12px;
+    font-size: 14px;
+    background: #fff;
+    border: 1px solid var(---, #ecedf0);
+    border-radius: 4px;
+
+    &-label {
+      display: flex;
+      gap: 4px;
+      align-items: center;
+    }
+
+    &:hover {
+      // color: #116ACC;
+      border-color: @primary-color;
+      cursor: pointer;
+    }
+
+    &:focus {
+      border-color: @primary-color;
+    }
+
+    &:active {
+      border-color: @primary-color;
+    }
+
+    &-active {
+      border-color: @primary-color;
+      box-shadow: 0 0 0 4px #f0f7ff;
+    }
+
+    &-popover {
+      padding-top: 0 !important;
+      .ant-popover-arrow {
+        display: none;
+      }
+
+      .ant-popover-inner-content {
+        padding: 0 16px 16px;
+      }
+
+      .ant-picker-dropdown {
+        padding-top: 0;
+
+        .ant-picker-range-arrow {
+          display: none;
+        }
+      }
+
+      .ant-tabs-top > .ant-tabs-nav::before {
+        border-bottom: 1px solid #fafafb;
+      }
+
+      .ant-tabs-tab {
+        padding: 12px 0 !important;
+        font-size: 14px !important;
+      }
+
+      .ant-popover-inner {
+        background: #fff;
+        border-radius: 8px;
+        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
+
+    &-error {
+      position: relative;
+      border: 1px solid var(--io-Error-E-, #fb5547) !important;
+
+      &::after {
+        position: absolute;
+        width: 67px;
+        color: red;
+        font-size: 12px;
+        content: '请输入内容';
+      }
+    }
+  }
+
+  &-panel {
+    & div:last-of-type {
+      position: relative !important;
+    }
+    .biz-date-picker-old-wrap-drop {
+      top: 0 !important;
+      margin-top: 12px;
+      padding: 0;
+    }
+    .ant-picker-panel-container {
+      background: #fff;
+      border: 1px solid var(--io-n-02, #f2f3f4);
+      border-radius: 10px;
+      box-shadow: none;
+    }
+
+    .ant-picker-panel-container .ant-picker-panel-focused {
+      border-color: var(--io-n-02, #f2f3f4);
+    }
+  }
+
+  &-popoverContent-btns {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: flex;
+    gap: 16px;
+    justify-content: flex-end;
+  }
+}

package/es/datePickerV2/types.d.ts

@@ -27,6 +27,7 @@ export declare namespace DatePickerTypes {
         dateTypeList?: Unit[];
         hiddenUnitType?: boolean;
         shortcuts?: DatePickerTypes.Option[];
+        openComparison?: boolean;
     }
     interface Option {
         label: string;

package/es/datePickerV2/utils.js

@@ -45,6 +45,9 @@ export var getTypeList = function getTypeList(currentType, includeToday, shortcu
     label: '按小时',
     value: DatePickerTypes.Unit.hour,
     children: [{
+      value: '今天',
+      count: 0
+    }, {
       value: '昨天',
       count: 1
     }, {
@@ -55,6 +58,9 @@ export var getTypeList = function getTypeList(currentType, includeToday, shortcu
     label: '按天',
     value: DatePickerTypes.Unit.day,
     children: [{
+      value: '今天',
+      count: 0
+    }, {
       value: '7天',
       count: 7
     }, {
@@ -107,8 +113,8 @@ export var getTypeList = function getTypeList(currentType, includeToday, shortcu
   var list = (((_find = (shortcuts ? shortcuts : defaultShortcuts).find(function (item) {
     return item.value === currentType;
   })) === null || _find === void 0 ? void 0 : _find.children) || []).filter(function (item) {
-    if (currentType === 'day') {
-      if (!includeToday && (item.count === 0 || item.count === 1)) return false;
+    if (currentType === 'day' || currentType === 'hour') {
+      if (!includeToday && item.count === 0) return false;
       return true;
     }
     return true;

package/es/demoWrapper/content.js

@@ -16,6 +16,7 @@ import convertAttributeData from '../attributeSelector/util';
 import BizGlobalDataContext from '../context';
 import request from '../utils/ajax';
 import useBizStore from '../hooks/useBizStore';
+import { eventApi } from '../utils';
 var catchPool = {};
 function ajax(url, options) {
   return new Promise(function (resolve, reject) {
@@ -198,15 +199,8 @@ var DemoContent = function DemoContent(_ref3) {
   }
   function loadEvents() {
     setLoadEvent(true);
-    ajax('/zg/web/v2/data/queryEventMetasOfGroup', {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
-        platform: 0,
-        isAll: true
-      }
-    }).then(function (res) {
-      setEventGroups(res.data);
+    eventApi.fetchAllEvents(currentApp === null || currentApp === void 0 ? void 0 : currentApp.id, 0, false).then(function (eventGroups) {
+      setEventGroups(Array.isArray(eventGroups) ? eventGroups : []);
       setLoadEvent(false);
     });
   }
@@ -250,7 +244,12 @@ var DemoContent = function DemoContent(_ref3) {
       tagLoading: tagLoading,
       setTagList: setTagList,
       queryGroups: queryGroups,
-      queryTags: queryTags
+      queryTags: queryTags,
+      envs: {
+        staticFilePath: function staticFilePath(src) {
+          return 'https://demo.zhugeio.com/zg-analysis/' + src;
+        }
+      }
     }, contextProps)
   }, children));
 };

package/es/demoWrapper/index.less

@@ -1,3 +1,3 @@
-@import '~antd/dist/antd.less';
-@import '../assets/iconfont/iconfont.css';
-@import '../assets/styles/resetAntd.less';
+@import '~antd/dist/antd.less';
+@import '../assets/iconfont/iconfont.css';
+@import '../assets/styles/resetAntd.less';

package/es/demoWrapper/innerDemo.js

@@ -5,7 +5,7 @@ var InnerDemo = function InnerDemo(_ref) {
     contextProps = _ref.contextProps;
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 461,
+    defaultApp: 163,
     contextProps: contextProps
   }, /*#__PURE__*/React.createElement("div", {
     style: {

package/es/dialog/index.d.ts

@@ -2,5 +2,8 @@ import React from 'react';
 import { DialogTypes } from './types';
 import './styles/index.less';
 export declare const classPrefix = "biz-dialog";
-declare const BizDialog: React.FC<DialogTypes.Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizDialog: FCWithDefaultProps<DialogTypes.Props>;
 export default BizDialog;

package/es/dialog/styles/index.less

@@ -1,22 +1,22 @@
-@import '../../assets/styles/inner.less';
-
-.biz-dialog {
-  &-input.ant-input-affix-wrapper {
-    border-radius: @border-radius-small;
-  }
-
-  .ant-form-item-label > label {
-    height: @height-lg;
-  }
-}
-.biz-dialog-wrap {
-  .ant-modal-close {
-    top: 5px;
-    right: 5px;
-
-    .bsicon {
-      color: @text-color;
-      font-size: 24px !important;
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-dialog {
+  &-input.ant-input-affix-wrapper {
+    border-radius: @border-radius-small;
+  }
+
+  .ant-form-item-label > label {
+    height: @height-lg;
+  }
+}
+.biz-dialog-wrap {
+  .ant-modal-close {
+    top: 5px;
+    right: 5px;
+
+    .bsicon {
+      color: @text-color;
+      font-size: 24px !important;
+    }
+  }
+}

package/es/dnd/demo/index.js

@@ -19,8 +19,12 @@ export default (function () {
     tempClassName: styles.temp,
     draddingClassName: styles.doing,
     itemRender: function itemRender(data) {
+      var _data = data.label;
       return /*#__PURE__*/React.createElement("div", {
-        key: data.id
+        key: data.id,
+        onClick: function onClick() {
+          return console.log(_data);
+        }
       }, data.label);
     },
     onChange: function onChange(list) {

package/es/dnd/demo/styles/index.less

@@ -1,34 +1,34 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.container {
-  padding: @padding-md;
-  border: 1px solid @border-color-base;
-  border-radius: @border-radius-normal;
-}
-.item {
-  display: inline-block;
-  width: 10%;
-  height: 150px;
-  margin: @margin-md;
-  line-height: 150px;
-  text-align: center;
-  vertical-align: top;
-  background: @background-color-base;
-  border-radius: @border-radius-normal;
-}
-.temp {
-  display: inline-block;
-  border: 2px dashed @primary-color;
-  border-radius: @border-radius-normal;
-}
-.add {
-  font-size: 48px;
-  cursor: pointer;
-}
-.doing {
-  border: 1px solid @warning-color;
-}
-.handle {
-  display: block;
-  height: 25px;
-  background: @info-color;
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.container {
+  padding: @padding-md;
+  border: 1px solid @border-color-base;
+  border-radius: @border-radius-normal;
+}
+.item {
+  display: inline-block;
+  width: 10%;
+  height: 150px;
+  margin: @margin-md;
+  line-height: 150px;
+  text-align: center;
+  vertical-align: top;
+  background: @background-color-base;
+  border-radius: @border-radius-normal;
+}
+.temp {
+  display: inline-block;
+  border: 2px dashed @primary-color;
+  border-radius: @border-radius-normal;
+}
+.add {
+  font-size: 48px;
+  cursor: pointer;
+}
+.doing {
+  border: 1px solid @warning-color;
+}
+.handle {
+  display: block;
+  height: 25px;
+  background: @info-color;
+}

package/es/dnd/index.d.ts

@@ -2,5 +2,8 @@ import React from 'react';
 import { DndTypes } from './types';
 import './styles/index.less';
 export declare const classPrefix = "biz-dnd";
-declare const BizDnd: React.FC<DndTypes.ContainerProps>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizDnd: FCWithDefaultProps<DndTypes.ContainerProps>;
 export default BizDnd;

package/es/dnd/item.js

@@ -26,7 +26,15 @@ var BizDndItem = function BizDndItem(props) {
     isDragging = _useState2[0],
     setIsDragging = _useState2[1];
   var ref = useRef();
+  var startPos = useRef({
+    x: 0,
+    y: 0
+  });
   function onMousedown(e) {
+    startPos.current = {
+      x: e.clientX,
+      y: e.clientY
+    };
     var _e$currentTarget$getB = e.currentTarget.getBoundingClientRect(),
       top = _e$currentTarget$getB.top,
       left = _e$currentTarget$getB.left;
@@ -51,6 +59,12 @@ var BizDndItem = function BizDndItem(props) {
     }
   }
   function onMouseMove(e) {
+    var dx = e.clientX - startPos.current.x;
+    var dy = e.clientY - startPos.current.y;
+    var distance = Math.sqrt(dx * dx + dy * dy);
+    if (distance <= 10) {
+      return;
+    }
     var computedStyle = window.getComputedStyle(ref.current);
     style.position = 'fixed';
     style.top += e.clientY - (preMouse.y || 0);