@zgfe/modules-interval 1.0.23-zhongyuan.2 → 1.0.23-zhongyuan.20

package/dist/esm/modules/topPanel/index.js

@@ -73,13 +73,12 @@ var TopPanel = function TopPanel(props) {
   }, [formRef.current, propsDefaultValue]);
   function onSearch(values) {
     if (props.onChange) {
-      var _values$analysisSubje, _values$analysisSubje2, _values$analysisSubje3, _values$analysisSubje4;
       props.onChange(_objectSpread(_objectSpread({}, values), {}, {
-        analysisSubject: values !== null && values !== void 0 && values.analysisSubject ? {
-          subjectId: values === null || values === void 0 ? void 0 : (_values$analysisSubje = values.analysisSubject) === null || _values$analysisSubje === void 0 ? void 0 : _values$analysisSubje.id,
-          subjectName: values === null || values === void 0 ? void 0 : (_values$analysisSubje2 = values.analysisSubject) === null || _values$analysisSubje2 === void 0 ? void 0 : _values$analysisSubje2.subjectName,
-          subjectAlias: values === null || values === void 0 ? void 0 : (_values$analysisSubje3 = values.analysisSubject) === null || _values$analysisSubje3 === void 0 ? void 0 : _values$analysisSubje3.subjectAlias,
-          unit: values === null || values === void 0 ? void 0 : (_values$analysisSubje4 = values.analysisSubject) === null || _values$analysisSubje4 === void 0 ? void 0 : _values$analysisSubje4.unit
+        analysisSubject: values.analysisSubject ? {
+          subjectId: values.analysisSubject.id,
+          subjectName: values.analysisSubject.subjectName,
+          subjectAlias: values.analysisSubject.subjectAlias,
+          unit: values.analysisSubject.unit
         } : undefined
       }), true);
     }
@@ -116,12 +115,12 @@ var TopPanel = function TopPanel(props) {
       return;
     }
     setInited(false);
-    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.analysisSubject) {
+    if (defaultValue.analysisSubject) {
       setAnalysisType('eventProp');
     } else {
       setAnalysisType('user');
     }
-    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.analysisSubject) {
+    if (defaultValue.analysisSubject) {
       setCurrentSubject(subjectList.find(function (item) {
         var _defaultValue$analysi;
         return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
@@ -175,7 +174,7 @@ var TopPanel = function TopPanel(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "bangzhu",
       onClick: function onClick() {
-        return window.open('https://docs.zhugeio.com/datamanager/Statistical_caliber.html', '_blank');
+        return window.open("".concat(location.origin, "/webapp/app/help/intro"), '_blank');
       }
     }))),
     className: "panel-form-interval-item"

package/dist/esm/modules/topPanel/styles/index.less

@@ -1,219 +1,219 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.top-panel-interval {
-  &-form-botton-box {
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 24px;
-    margin-right: 24px;
-
-    > :nth-child(1) {
-      margin-right: 16px;
-      color: #fff;
-      background-color: #29bd52;
-      border-color: #29bd52;
-    }
-  }
-
-  &-label-hasIcon {
-    .bsicon {
-      cursor: pointer;
-    }
-  }
-}
-
-.panel-form-interval {
-  .ant-form-item-explain-error {
-    margin-left: 24px;
-  }
-  &-item {
-    .ant-form-item-label {
-      padding-left: 24px !important;
-      font-weight: 500;
-    }
-    .ant-form-item-control-input-content {
-      height: 40px;
-      padding: 0 24px !important;
-      line-height: 40px !important;
-      .biz-select-handle {
-        display: inline-block;
-        width: 208px;
-      }
-      span.ant-radio + * {
-        padding-right: 40px;
-        padding-left: 12px;
-      }
-      &:hover {
-        background-color: #e7f3fe;
-      }
-    }
-  }
-  .interval-item {
-    margin-top: -2px;
-    .ant-space-vertical {
-      gap: 0px !important;
-      width: 100%;
-      .ant-space-item:nth-child(1) {
-        padding: 0 12px;
-      }
-
-      .ant-space-item:nth-child(2) {
-        display: flex;
-        align-items: center;
-        height: 42px;
-        margin-top: 4px;
-        padding: 0 12px;
-      }
-
-      .ant-space-item:nth-child(2):hover {
-        background-color: #e7f3fe;
-      }
-    }
-  }
-
-  .biz-user-group-header {
-    padding: 0;
-    background-color: #fff;
-  }
-
-  .space-item {
-    .ant-space-item {
-      .biz-user-group {
-        width: 100%;
-        min-width: 208px;
-      }
-    }
-
-    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
-      display: none;
-    }
-  }
-
-  .collapseRefs {
-    .ant-form-item {
-      margin-bottom: 16px;
-    }
-
-    .ant-form-item-control-input {
-      display: flex;
-      align-items: center;
-    }
-
-    .ant-form-item-label {
-      padding-left: 24px;
-      font-weight: 500;
-    }
-
-    .interval-box {
-      > div:nth-child(1) {
-        padding: 4px 24px;
-      }
-
-      > div:nth-child(1):hover {
-        background-color: #e7f3fe;
-      }
-
-      .biz-attr-condition-group-handle {
-        margin-right: 0;
-        margin-left: 32px;
-      }
-
-      .biz-attr-condition-group-container {
-        gap: 0px !important;
-      }
-
-      .biz-attr-condition-group-container-item {
-        max-width: calc(100% + 32px) !important;
-        margin-top: 4px;
-        padding: 4px 56px;
-        .ant-space-item {
-          width: auto;
-          max-width: auto;
-          margin-left: 0px;
-          padding: 0;
-        }
-      }
-
-      .ant-space-item:hover {
-        background-color: #e7f3fe;
-      }
-    }
-
-    .dimension-interval {
-      .ant-form-item-control-input {
-        padding: 4px 24px;
-      }
-
-      .ant-form-item-control-input:hover {
-        background-color: #e7f3fe;
-      }
-    }
-  }
-
-  .biz-event-select {
-    width: 208px;
-  }
-
-  > .ant-form-item {
-    margin-bottom: 16px;
-    .biz-user-group-val {
-      color: #021429;
-    }
-  }
-
-  .associated {
-    margin-top: -10px;
-    margin-bottom: 12px;
-
-    .qingchu {
-      color: #9aa1a9;
-    }
-
-    .qingchu:hover {
-      color: @error-color;
-    }
-
-    .ant-form-item-control-input {
-      padding: 4px 24px;
-
-      .ant-form-item-control-input {
-        padding: 0;
-      }
-
-      .ant-form-item {
-        margin-bottom: 0;
-      }
-    }
-
-    .ant-form-item-control-input:hover {
-      background-color: #e7f3fe;
-    }
-
-    .associated-link {
-      display: block;
-      line-height: 32px;
-    }
-
-    .ant-form-item-row {
-      flex-direction: inherit;
-    }
-
-    .ant-form-item-control-input-content {
-      display: flex;
-      gap: 12px;
-    }
-
-    .associated-label {
-      color: var(--3, #5f6085);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: PingFang SC;
-      font-style: normal;
-      line-height: 32px;
-      text-align: right;
-    }
-    .ant-form-item-explain-error {
-      margin-left: 0 !important;
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.top-panel-interval {
+  &-form-botton-box {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 24px;
+    margin-right: 24px;
+
+    > :nth-child(1) {
+      margin-right: 16px;
+      color: #fff;
+      background-color: #29bd52;
+      border-color: #29bd52;
+    }
+  }
+
+  &-label-hasIcon {
+    .bsicon {
+      cursor: pointer;
+    }
+  }
+}
+
+.panel-form-interval {
+  .ant-form-item-explain-error {
+    margin-left: 24px;
+  }
+  &-item {
+    .ant-form-item-label {
+      padding-left: 24px !important;
+      font-weight: 500;
+    }
+    .ant-form-item-control-input-content {
+      height: 40px;
+      padding: 0 24px !important;
+      line-height: 40px !important;
+      .biz-select-handle {
+        display: inline-block;
+        width: 208px;
+      }
+      span.ant-radio + * {
+        padding-right: 40px;
+        padding-left: 12px;
+      }
+      &:hover {
+        background-color: #e7f3fe;
+      }
+    }
+  }
+  .interval-item {
+    margin-top: -2px;
+    .ant-space-vertical {
+      gap: 0px !important;
+      width: 100%;
+      .ant-space-item:nth-child(1) {
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2) {
+        display: flex;
+        align-items: center;
+        height: 42px;
+        margin-top: 4px;
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2):hover {
+        background-color: #e7f3fe;
+      }
+    }
+  }
+
+  .biz-user-group-header {
+    padding: 0;
+    background-color: #fff;
+  }
+
+  .space-item {
+    .ant-space-item {
+      .biz-user-group {
+        width: 100%;
+        min-width: 208px;
+      }
+    }
+
+    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
+      display: none;
+    }
+  }
+
+  .collapseRefs {
+    .ant-form-item {
+      margin-bottom: 16px;
+    }
+
+    .ant-form-item-control-input {
+      display: flex;
+      align-items: center;
+    }
+
+    .ant-form-item-label {
+      padding-left: 24px;
+      font-weight: 500;
+    }
+
+    .interval-box {
+      > div:nth-child(1) {
+        padding: 4px 24px;
+      }
+
+      > div:nth-child(1):hover {
+        background-color: #e7f3fe;
+      }
+
+      .biz-attr-condition-group-handle {
+        margin-right: 0;
+        margin-left: 32px;
+      }
+
+      .biz-attr-condition-group-container {
+        gap: 0px !important;
+      }
+
+      .biz-attr-condition-group-container-item {
+        max-width: calc(100% + 32px) !important;
+        margin-top: 4px;
+        padding: 4px 56px;
+        .ant-space-item {
+          width: auto;
+          max-width: auto;
+          margin-left: 0px;
+          padding: 0;
+        }
+      }
+
+      .ant-space-item:hover {
+        background-color: #e7f3fe;
+      }
+    }
+
+    .dimension-interval {
+      .ant-form-item-control-input {
+        padding: 4px 24px;
+      }
+
+      .ant-form-item-control-input:hover {
+        background-color: #e7f3fe;
+      }
+    }
+  }
+
+  .biz-event-select {
+    width: 208px;
+  }
+
+  > .ant-form-item {
+    margin-bottom: 16px;
+    .biz-user-group-val {
+      color: #021429;
+    }
+  }
+
+  .associated {
+    margin-top: -10px;
+    margin-bottom: 12px;
+
+    .qingchu {
+      color: #9aa1a9;
+    }
+
+    .qingchu:hover {
+      color: @error-color;
+    }
+
+    .ant-form-item-control-input {
+      padding: 4px 24px;
+
+      .ant-form-item-control-input {
+        padding: 0;
+      }
+
+      .ant-form-item {
+        margin-bottom: 0;
+      }
+    }
+
+    .ant-form-item-control-input:hover {
+      background-color: #e7f3fe;
+    }
+
+    .associated-link {
+      display: block;
+      line-height: 32px;
+    }
+
+    .ant-form-item-row {
+      flex-direction: inherit;
+    }
+
+    .ant-form-item-control-input-content {
+      display: flex;
+      gap: 12px;
+    }
+
+    .associated-label {
+      color: var(--3, #5f6085);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: 32px;
+      text-align: right;
+    }
+    .ant-form-item-explain-error {
+      margin-left: 0 !important;
+    }
+  }
+}

package/dist/esm/types.d.ts

@@ -80,7 +80,10 @@ export interface SearchValue {
     /**
      * @description  显示设置
      */
-    displaySetup?: string[];
+    displaySetup?: {
+        label: string;
+        value: number;
+    }[];
     /**
      * @description   日期
      * @default       最近一天
@@ -130,6 +133,10 @@ export interface SearchValue {
         subjectAlias?: string;
         unit: string;
     };
+    showList?: {
+        label: string;
+        value: number;
+    }[];
 }
 export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
 /**

package/dist/esm/types.js

@@ -1,15 +1,15 @@
 import { createContext } from 'react';
 
-/**
- * 属性选择器 默认值
+/**
+ * 属性选择器 默认值
  */
 
-/**
- * 图表选择类型
+/**
+ * 图表选择类型
  */
 
-/**
- * series value
+/**
+ * series value
  */
 
 var defaultContext = {

package/dist/esm/utils/formData.d.ts

@@ -65,7 +65,7 @@ export declare function formTableData(originalData: ChartData): {
         names: string[];
         originalNames: string[];
     }[];
-}[] | undefined;
+}[];
 type ChartData = {
     appData: {
         series?: {
@@ -77,7 +77,7 @@ type ChartData = {
         xAxis?: string[];
     };
 };
-export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): string[] | undefined;
+export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): (string | undefined)[] | undefined;
 /**
  * 获取查询结果
  * @param source 结果数据

package/dist/esm/utils/formData.js

@@ -232,8 +232,9 @@ export function formTableData(originalData) {
 function createNewArray(data) {
   var _series$, _series$$total;
   var _data$appData = data === null || data === void 0 ? void 0 : data.appData,
-    series = _data$appData.series;
-  if (series && ((_series$ = series[0]) === null || _series$ === void 0 ? void 0 : (_series$$total = _series$.total) === null || _series$$total === void 0 ? void 0 : _series$$total.length) === 0) {
+    _data$appData$series = _data$appData.series,
+    series = _data$appData$series === void 0 ? [] : _data$appData$series;
+  if (series && (series === null || series === void 0 ? void 0 : (_series$ = series[0]) === null || _series$ === void 0 ? void 0 : (_series$$total = _series$.total) === null || _series$$total === void 0 ? void 0 : _series$$total.length) === 0) {
     return getChildrenData(data, 0);
   } else {
     var newArray = series === null || series === void 0 ? void 0 : series.map(function (item, i) {
@@ -262,13 +263,15 @@ export function convertDateArray(params, dateArray) {
       case 'week':
       case 'month':
         var convertedArray = dateArray === null || dateArray === void 0 ? void 0 : dateArray.map(function (dateRange) {
-          var _dateRange$split = dateRange.split('|'),
-            _dateRange$split2 = _slicedToArray(_dateRange$split, 2),
-            startDate = _dateRange$split2[0],
-            endDate = _dateRange$split2[1];
-          var formattedStartDate = startDate.split('-').slice(1).join('-');
-          var formattedEndDate = endDate.split('-').slice(1).join('-');
-          return "".concat(formattedStartDate, "\uFF5E").concat(formattedEndDate);
+          if (dateRange.includes('|')) {
+            var _dateRange$split = dateRange.split('|'),
+              _dateRange$split2 = _slicedToArray(_dateRange$split, 2),
+              startDate = _dateRange$split2[0],
+              endDate = _dateRange$split2[1];
+            var formattedStartDate = startDate.split('-').slice(1).join('-');
+            var formattedEndDate = endDate.split('-').slice(1).join('-');
+            return "".concat(formattedStartDate, "\uFF5E").concat(formattedEndDate);
+          }
         });
         return convertedArray;
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.23-zhongyuan.2",
+  "version": "1.0.23-zhongyuan.20",
   "private": false,
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
@@ -42,7 +42,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.10",
+    "@zgfe/business-lib": "1.2.71-hxd.31",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -59,7 +59,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e90168f1ab7052d0f46438adffc98ab9be1c8c6c",
+  "gitHead": "89128080db9fbac26cbff23dbe2188780f3d7e33",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }