@zgfe/business-lib 1.1.82-user.1 → 1.1.82-user.3

package/es/addToPanel/index.js

@@ -90,7 +90,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     if (!searchParam.appId && searchParam['app_id']) {
       searchParam.appId = searchParam['app_id'];
     }
-    searchParam.chartType = form.chartType;
+    searchParam.chartType = form.chartType || props.params.chartType;
     form.extendTarget ? searchParam.extendTarget = form.extendTarget : null;
     var resData = {
       data: searchParam,

package/es/chart/demo/data/data.js

@@ -1,5 +1,5 @@
 export default {
-  xAxis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
+  xAxis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2023-09-17', '2023-09-18'],
   series: [{
     names: ['付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
     values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]

package/es/chart/index.js

@@ -17,6 +17,8 @@ import { getChartOption, getPieOption, getMapOption } from './util/chartOptionCo
 import { provinceSeries, citySeries, maxMinValue } from './util/mapUtil';
 import { formatPieData, formatChartData } from './util/formatData';
 import './util/data/china.js';
+import moment from 'moment';
+import _ from 'lodash';
 var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var type = props.type,
     data = props.data,
@@ -46,6 +48,53 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     instance = _useState4[0],
     setInstance = _useState4[1];
+  function dashedLineFormat(option) {
+    var overTime = false;
+    option.xAxis.data.forEach(function (label, index) {
+      if (overTime) return;
+      if (!/\d{4}-\d{2}-\d{2}/.test(label)) return;
+      var laterTime = label.replace(/[-:\s]*/g, '');
+      var currentDate = new Date();
+      var currentDateTime = moment().format('YYYYMMDD');
+      if (/\d{2}:\d{2}:\d{2}/.test(label)) {
+        currentDateTime += currentDate.toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0].replace(/:/g, '');
+      } else if (/\|/.test(label)) {
+        laterTime = label.split('|')[1].replace(/[-:\s]*/g, '');
+      }
+      if (parseInt(laterTime) >= Number(currentDateTime)) {
+        overTime = true;
+        var dashedSeries = [];
+        option.series.forEach(function (series, seriesIndex) {
+          var dashedItem = addDashedSeries(series, index - 1);
+          dashedItem.itemStyle.normal.color = dashedItem.lineStyle.normal.color = option.color[seriesIndex];
+          dashedSeries.push(dashedItem);
+        });
+        option.series = option.series.concat(dashedSeries);
+      }
+    });
+    return option;
+  }
+  function addDashedSeries(series, dashedIndex) {
+    var dashedSeries = _.cloneDeep(series);
+    if (!dashedSeries.lineStyle) dashedSeries.lineStyle = {
+      normal: {}
+    };
+    dashedSeries.lineStyle.normal.type = 'dashed';
+    if (!dashedSeries.itemStyle) dashedSeries.itemStyle = {
+      normal: {}
+    };
+    series.data.forEach(function (_v, i) {
+      if (i > dashedIndex) {
+        series.data.splice(i, 1, null);
+      }
+    });
+    dashedSeries.data.forEach(function (_v, i) {
+      if (i < dashedIndex) {
+        dashedSeries.data.splice(i, 1, null);
+      }
+    });
+    return dashedSeries;
+  }
   useEffect(function () {
     if (option) {
       setChartOption(function () {
@@ -70,6 +119,9 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (colors) {
       eOption.color = colors;
     }
+    if (type === 'line') {
+      eOption = dashedLineFormat(eOption);
+    }
     setChartOption(function () {
       return _objectSpread({}, eOption);
     });

package/es/chart/util/formatOption.js

@@ -14,7 +14,12 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params, resultFor
   }
   var htmlArray = [];
   htmlArray.push("<div class=\"biz-chart-tooltip-title\">".concat(xLabel, "</div>"));
+  var seriesMap = {};
   params.forEach(function (item) {
+    if (item.value === null || item.value === undefined || seriesMap[item.seriesName] !== null && seriesMap[item.seriesName] !== undefined) {
+      return;
+    }
+    seriesMap[item.seriesName] = item.value;
     var lineLabel = item.value;
     if (item.seriesName.indexOf('CTR') > -1) {
       lineLabel += '%';

package/es/context/index.d.ts

@@ -54,6 +54,8 @@ export interface GlobalContextProps {
     tagList?: UserTagsSelectorTypes.Tag[];
     tagLoading?: boolean;
     setTagList?: React.Dispatch<React.SetStateAction<UserTagsSelectorTypes.Tag[]>>;
+    queryGroups?: () => void;
+    queryTags?: () => void;
     showUserGroupModal?: (onCreate: (group: UserGroupTypes.Group) => void, onBack?: () => void) => void;
     eventGroupList?: EventGroup[];
     eventNameMap?: Record<string, AnalysisEvent>;

package/es/demoWrapper/content.js

@@ -91,7 +91,9 @@ var DemoContent = function DemoContent(_ref3) {
     setUserGroupList = _useBizStore.setUserGroupList,
     tagList = _useBizStore.tagList,
     tagLoading = _useBizStore.tagLoading,
-    setTagList = _useBizStore.setTagList;
+    setTagList = _useBizStore.setTagList,
+    queryGroups = _useBizStore.queryGroups,
+    queryTags = _useBizStore.queryTags;
   useEffect(function () {
     if (!needMeta || !currentApp) return;
     if (currentApp.appsHasData && currentApp.appsHasData.length) {
@@ -172,7 +174,9 @@ var DemoContent = function DemoContent(_ref3) {
       setUserGroupList: setUserGroupList,
       tagList: tagList,
       tagLoading: tagLoading,
-      setTagList: setTagList
+      setTagList: setTagList,
+      queryGroups: queryGroups,
+      queryTags: queryTags
     }, contextProps)
   }, children));
 };

package/es/demoWrapper/innerDemo.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
+import { GlobalContextProps } from '../context';
 declare const InnerDemo: React.FC<{
+    contextProps?: GlobalContextProps;
     children?: React.ReactNode;
 }>;
 export default InnerDemo;

package/es/demoWrapper/innerDemo.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import DemoWrapper from '.';
 var InnerDemo = function InnerDemo(_ref) {
-  var children = _ref.children;
+  var children = _ref.children,
+    contextProps = _ref.contextProps;
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: globalConfig.appId
+    defaultApp: globalConfig.appId,
+    contextProps: contextProps
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '16px',

package/es/hooks/useBizStore.d.ts

@@ -12,5 +12,7 @@ declare function useBizStore({ currentApp, menuNameMap, }: {
     tagLoading: boolean;
     setUserGroupList: React.Dispatch<React.SetStateAction<UserGroupTypes.Group[]>>;
     setTagList: React.Dispatch<React.SetStateAction<UserTagsSelectorTypes.Tag[]>>;
+    queryTags: () => void;
+    queryGroups: () => void;
 };
 export default useBizStore;

package/es/hooks/useBizStore.js

@@ -91,7 +91,9 @@ function useBizStore(_ref) {
     tagList: tagList,
     tagLoading: tagLoading,
     setUserGroupList: setUserGroupList,
-    setTagList: setTagList
+    setTagList: setTagList,
+    queryTags: queryTags,
+    queryGroups: queryGroups
   };
 }
 export default useBizStore;

package/es/layout/optionTitle/index.js

@@ -44,7 +44,7 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
   useEffect(function () {
     var _props$value2, _props$value3;
     if (!((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.panelId)) return;
-    setOptions(((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.target.id) ? panelBtn(onClick) : panelCreateBtn(onClick));
+    setOptions(((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.target.id) ? panelBtn(onClick, props === null || props === void 0 ? void 0 : props.disabled) : panelCreateBtn(onClick, props === null || props === void 0 ? void 0 : props.disabled));
   }, []);
   var onClick = function onClick(type) {
     if (type === BizOptionTitleProps.OptionTypes.CANCEL) {

package/es/layout/optionTitle/types.d.ts

@@ -3,6 +3,7 @@ import AddToPanel from '../../addToPanel/types';
 export declare namespace BizOptionTitleProps {
     export interface Props {
         value?: Value;
+        disabled?: boolean;
         styleOptions?: AddToPanel.TabItem[];
         children?: React.ReactNode;
         afterEditTarget?: (type: string, value?: any) => void;

package/es/userGroup/demo/index.js

@@ -1,17 +1,103 @@
-import React from 'react';
+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 = 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, { useState } from 'react';
 import { BizUserGroup } from '@zgfe/business-lib';
 import InnerDemo from '../../demoWrapper/innerDemo';
 import { Space } from 'antd';
+import { BizDialog } from '@zgfe/business-lib';
+var group = {
+  appId: 251,
+  color: '#8db3e2',
+  createTime: {
+    date: 18,
+    day: 1,
+    hours: 11,
+    minutes: 14,
+    month: 8,
+    seconds: 53,
+    time: 1695006893000,
+    timezoneOffset: -480,
+    year: 123
+  },
+  description: '',
+  groupType: 0,
+  id: 943,
+  isComplete: 1,
+  isDelete: 0,
+  json: [[{
+    eventId: '-3',
+    runPeriod: {
+      values: ['30', '0'],
+      operator: 'relative'
+    },
+    runTimes: {
+      values: ['1'],
+      operator: '>='
+    },
+    attrs: []
+  }]],
+  name: 'cvd2',
+  platform: 0,
+  size: 0,
+  source: '',
+  staticGroupCondition: '',
+  tableName: '',
+  timeRange: 0,
+  updateTime: {
+    date: 18,
+    day: 1,
+    hours: 11,
+    minutes: 14,
+    month: 8,
+    seconds: 53,
+    time: 1695006893000,
+    timezoneOffset: -480,
+    year: 123
+  }
+};
 var UserGroupDemo = function UserGroupDemo() {
-  return /*#__PURE__*/React.createElement(InnerDemo, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(BizUserGroup, {
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    groupCallback = _useState2[0],
+    setGroupCallback = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showUserGroupModal = _useState4[0],
+    setShowUserGroupModal = _useState4[1];
+  return /*#__PURE__*/React.createElement(InnerDemo, {
+    contextProps: {
+      showUserGroupModal: function showUserGroupModal(onCreate, onBack) {
+        setGroupCallback({
+          onCreate: onCreate,
+          onBack: onBack
+        });
+        setShowUserGroupModal(true);
+      }
+    }
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(BizUserGroup, {
     enableDelete: false,
     enableTags: true,
-    value: ['4061:679558480527360'],
     placeholder: "\u652F\u6301\u6807\u7B7E",
     onChange: function onChange(value) {
       return console.log(value);
     }
-  }), /*#__PURE__*/React.createElement(BizUserGroup, {
+  }), showUserGroupModal && /*#__PURE__*/React.createElement(BizDialog, {
+    open: true,
+    title: "\u6DFB\u52A0\u7528\u6237\u7FA4",
+    closable: true,
+    onOk: function onOk() {
+      var _groupCallback$onCrea;
+      setShowUserGroupModal(false);
+      groupCallback === null || groupCallback === void 0 ? void 0 : (_groupCallback$onCrea = groupCallback.onCreate) === null || _groupCallback$onCrea === void 0 ? void 0 : _groupCallback$onCrea.call(groupCallback, group);
+    },
+    onCancel: function onCancel() {
+      setShowUserGroupModal(false);
+    }
+  }, "\u6DFB\u52A0\u7528\u6237\u7FA4"), /*#__PURE__*/React.createElement(BizUserGroup, {
     value: 758,
     enableDelete: false,
     placeholder: "\u4E0D\u652F\u6301\u6807\u7B7E",

package/es/userGroup/overlay.js

@@ -8,7 +8,7 @@ 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, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { classPrefix } from '.';
 import CascaderOverlay from '../userTagsSelector/cascaderOverlay';
 import Search from '../userTagsSelector/components/search';
@@ -58,7 +58,6 @@ var Overlay = function Overlay(_ref2) {
     enableTags = _useContext2.enableTags,
     value = _useContext2.value,
     setValue = _useContext2.setValue;
-  var groupRef = useRef();
   useEffect(function () {
     onSearch('');
     if (!enableTags) setType('userGroup');
@@ -71,16 +70,8 @@ var Overlay = function Overlay(_ref2) {
   }, []);
   useEffect(function () {
     if (!setValue) return;
-    console.log('setValue', type, currentGroup);
     setValue(type === 'tag' ? chosenTags : currentGroup);
   }, [type, chosenTags, currentGroup]);
-  useEffect(function () {
-    if (!groupRef.current) return;
-    console.log('groupRef.current:', groupRef.current);
-    setCurrentGroup(function () {
-      return groupRef.current;
-    });
-  }, [groupRef.current]);
   function onSearch(v) {
     if (v) {
       setShowList((userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.filter(function (item) {
@@ -94,11 +85,7 @@ var Overlay = function Overlay(_ref2) {
     onClickCreate === null || onClickCreate === void 0 ? void 0 : onClickCreate();
     if (showUserGroupModal) {
       showUserGroupModal(function (group) {
-        console.log('add:', group);
-        groupRef.current = group;
-        setCurrentGroup(function () {
-          return group;
-        });
+        setValue && setValue(group);
         setUserGroupList === null || setUserGroupList === void 0 ? void 0 : setUserGroupList([group].concat(_toConsumableArray(userGroupList)));
       });
     }

package/es/userGroupHeader/index.js

@@ -81,7 +81,9 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
     size: 12
   }, /*#__PURE__*/React.createElement(Space, {
     size: 16
-  }, /*#__PURE__*/React.createElement("label", null, "\u5206\u6790\u7528\u6237\u7FA4"), showBtn && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
+  }, /*#__PURE__*/React.createElement("label", {
+    className: "".concat(classPrefix, "-title")
+  }, "\u5206\u6790\u7528\u6237\u7FA4"), showBtn && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
     className: "".concat(classPrefix, "-sure"),
     onClick: onSure
   }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement("a", {

package/es/userGroupHeader/styles/index.less

@@ -2,8 +2,9 @@
 .biz-user-group-header {
   padding: 6px @margin-lg;
   background: #fff;
-  & > label {
+  &-title {
     color: @text-color-secondary;
+    font-weight: 500;
   }
   &-sure {
     display: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.82-user.1",
+  "version": "1.1.82-user.3",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "c9a4b459604075bc3b812793c795c7c2a2baf9ed",
+  "gitHead": "16fb86446971d7caf7832ab1f46d204f95c514aa",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }