@aliyun-sls/interface - npm Package Compare versions

Comparing version 0.3.7-dev-9 to 0.3.8

dist/interface.cjs.js

@@ -64,2 +64,9 @@ 'use strict';
 })(NullsConnectValueType || {});
+var DashboardRowInitType = /* @__PURE__ */ ((DashboardRowInitType2) => {
+  DashboardRowInitType2["Default"] = "0";
+  DashboardRowInitType2["CollapseAll"] = "1";
+  DashboardRowInitType2["ExpandAll"] = "2";
+  DashboardRowInitType2["ExpandFirst"] = "3";
+  return DashboardRowInitType2;
+})(DashboardRowInitType || {});
 
@@ -429,2 +436,3 @@ var ConnectDirection = /* @__PURE__ */ ((ConnectDirection2) => {
 exports.DashboardEventType = DashboardEventType;
+exports.DashboardRowInitType = DashboardRowInitType;
 exports.DataFieldGroupType = DataFieldGroupType;
@@ -431,0 +439,0 @@ exports.DataFieldType = DataFieldType;

package.json

 {
   "name": "@aliyun-sls/interface",
-  "version": "0.3.7-dev-9",
+  "version": "0.3.8",
   "description": "",
@@ -9,4 +9,4 @@ "main": "dist/interface.cjs.js",
   "dependencies": {
-    "@aliyun-sls/i18n": "0.3.7-dev-9"
+    "@aliyun-sls/i18n": "0.3.8"
   }
 }

src/components/index.ts

@@ -8,1 +8,2 @@ export * from './timeBtn'
 export * from './easyTable'
+export * from './svgIcon'

src/dashboard/charts/tableProChart/index.ts

@@ -57,2 +57,3 @@ import { TimeStateObj } from '../../../components'
   datasets: FieldDataSet[]
+  dataResources: FieldDataSet[]
   showAll: boolean
@@ -59,0 +60,0 @@ max?: number

src/dashboard/components/annotation.ts

@@ -15,2 +15,3 @@ import { DashboardChart, DashboardChartState } from "../core/dashboardChart"
   color: string
+  isNew?: boolean
   data?: any
@@ -20,15 +21,2 @@ tags?: string[]
 
-
-export interface AnnotationConfigProps {
-  show: boolean
-  annotations: AnnotationProps[]
-  updateAnnotations: (
-    annotation: AnnotationProps,
-    opType: 'add' | 'update' | 'delete',
-    originAnnotations?: AnnotationProps[]
-  ) => void
-  tagsList?: string[] | Array<{ label: string; value: string }>
-  canAddAnnotation?: boolean
-}
-
 export interface AnnotationOverlayButtonProps {
@@ -41,11 +29,13 @@ dashboardChart: DashboardChart
 interface CommonMarksRenderProps {
-  dashboardChart: DashboardChart
   annotations: AnnotationProps[]
-  onChartStateUpdate: (state?: DashboardChartState) => void
   updateAnnotations: (
     annotation: AnnotationProps,
     opType: 'add' | 'update' | 'delete',
-    originAnnotations?: AnnotationProps[]
+    shouldPutData?: boolean,
+    originAnnotations?: AnnotationProps[],
   ) => void
   tagsList?: string[] | Array<{ label: string; value: string }>
+  disableMarkers?: boolean
+  customRenderTooltip?: (mark: AnnotationMarkProps) => JSX.Element
+  customRenderAnnotationsEditor?: (mark: AnnotationMarkProps) => JSX.Element
 }
@@ -64,3 +54,4 @@
   y: number // 相对画布位置
-  width: number
+  width: number // 画布的宽度 用于定位
+  height: number // 整个画布的高度 用于定位
   defultOpenFrom: boolean
@@ -73,2 +64,3 @@ }
   canDetele: (id: string) => void
+  customRenderTooltip?: (mark: AnnotationMarkProps) => JSX.Element
 }

src/dashboard/components/drilldown/configCollaspe/builtInForm/types.ts

 import { SearchToken } from '../../drilldown/builtinHandler'
 import { DrilldownFormBaseConfig, DrilldownFormBaseSetting } from '../types'
+import { FieldDataSet } from '../../../../core/dashboardChart'
 
@@ -85,1 +86,4 @@ export interface FormPath {
 }
+export interface OpenDataExpressionEntityConfig extends DrilldownFormBaseConfig {
+  dataset: FieldDataSet
+}

src/dashboard/components/drilldown/configCollaspe/types.ts

@@ -84,6 +84,7 @@ import React, { ComponentType } from 'react'
 export interface DrilldownConfigSliderProps
-  extends Omit<DrilldownConfigPanelProps, 'onEventChange' | 'onFormChange' | 'form'> {
+  extends Omit<DrilldownConfigPanelProps, 'onEventChange' | 'onFormChange' | 'form' | 'events'> {
   onClose: () => void
-  onOK: (events: DrilldownEventKeyEvents) => void
+  onOK: (events: DrilldownEventKeyEvents, id: string) => void
   visible: boolean
+  builder: DrilldownEventsBuilderBase
 }
@@ -139,1 +140,12 @@
 }
+
+export interface SubDrilldownEventsBuilderConfig {
+  id: string
+  name: string
+  events: DrilldownEventKeyEvents
+}
+export interface DrilldownEventsBuilderBase {
+  addSubOptionBuilder: (subItem: SubDrilldownEventsBuilderConfig) => this
+  updateSubOptionBuilder: (subItem: SubDrilldownEventsBuilderConfig) => this
+  getOptions: () => { items: SubDrilldownEventsBuilderConfig[] }
+}

src/dashboard/components/drilldown/dashboardDrilldownOverlay/index.ts

 export * from './dashboardDrilldownOverlay'
 export * from './triggerDashbaordDrilldown'
 export * from './triggerDataExpression'
+export * from './drilldownContext'

src/dashboard/components/drilldown/drilldown/builtinHandler.ts

@@ -0,1 +1,4 @@
+import { DashboardDrilldownFieldInfo } from '../dashboardDrilldownOverlay'
+import { DashboardDrilldownContextProps } from '../dashboardDrilldownOverlay/drilldownContext'
+
 export interface EventHandlerArgs<IConfig = any, Settings = any> {
@@ -20,2 +23,4 @@ event: string
   onClose: () => void
+  drilldownContextValue?: DashboardDrilldownContextProps
+  fieldInfo?: DashboardDrilldownFieldInfo
 }
@@ -22,0 +27,0 @@

src/dashboard/core/dashboardChart.ts

@@ -6,3 +6,4 @@ import { ChartNamespace } from './chartNamespace'
 import { PieChartType, PieLabelType, TypeOption, ConnectDirection } from '../charts'
-import { AnnotationProps } from '../components'
+import { AnnotationProps, AnnotationMarkProps } from '../components'
+import { Search } from './registerDatasource'
 
@@ -195,4 +196,7 @@ // 渲染过程中的临时状态
   workspace?: string
+  project?: string
+  // resource or dataset
   dataset?: string
   field?: string
+  fieldMappings?: string[][]
   eventField?: string
@@ -292,9 +296,9 @@ datasetType?: string
   customRegisterTopoNode?: {
-    type: string,
-    getNodeShape: (v: any) => any,
+    type: string
+    getNodeShape: (v: any) => any
     extendShapeType?: string
-  },
+  }
   customRegisterTopoEdge?: {
-    type: string,
-    getEdgeShape: (v: any) => any,
+    type: string
+    getEdgeShape: (v: any) => any
     extendShapeType?: string
@@ -394,2 +398,16 @@ }
 
+/**
+ *  初始折叠行的状态
+ *  0 默认
+ *  1 折叠所有
+ *  2 展开所有
+ *  3 展开第一个，折叠其他的
+ */
+export enum DashboardRowInitType {
+  Default = '0',
+  CollapseAll = '1',
+  ExpandAll = '2',
+  ExpandFirst = '3',
+}
+
 export interface DashboardConfig extends PartialDashboardTimeObj {
@@ -412,2 +430,3 @@ isShare: boolean
   hiddenDashboardPadding: boolean
+
   // 隐藏图表右上角下拉菜单
@@ -430,3 +449,3 @@ hiddenChartMenus: boolean
   // 渲染服务是否支持csv
-  isSupportCsv:boolean
+  isSupportCsv: boolean
   // 渲染服务开启增强sql
@@ -459,2 +478,8 @@ openPsql: boolean
   viewChart?: string
+  disableViewChart: boolean
+  responsiveMinWidth: number
+  //  新窗口打开 previewQuery
+  openPreviewQueryInBlank: boolean
+  dashboardRowInitType: DashboardRowInitType
+  dashboardErrorPopWidth?:number
 }
@@ -502,1 +527,56 @@
 }
+
+export interface ToolsConfig {
+  zoomRangerTool?: ZoomRangerToolConfig
+}
+
+// TODO: 目前在SLSChart一些plugin的隐藏和显示都是直接挂在 display 需要收敛到特定的地方
+export interface PluginConfig {
+  drilldownConfig?: DrilldownConfigProps
+  annotationConfig?: AnnotationConfigProps
+  tooltipConfig?: any
+  zoomConfig?: ZoomnConfigProps
+}
+
+export interface ZoomRangerToolConfig {
+  // type: 'filter' | 'none'
+  show?: boolean
+  interval?: number
+  height?: number
+  width?: number
+}
+
+export interface AnnotationConfigProps {
+  show?: boolean
+  annotations: AnnotationProps[]
+  updateAnnotations: (
+    annotation: AnnotationProps,
+    opType: 'add' | 'update' | 'delete',
+    shouldPutData?: boolean,
+    originAnnotations?: AnnotationProps[]
+  ) => void
+  tagsList?: string[] | Array<{ label: string; value: string }>
+  customRenderTooltip?: (mark: AnnotationMarkProps) => JSX.Element
+  customRenderAnnotationsEditor?: (mark: AnnotationMarkProps) => JSX.Element
+}
+
+export interface DrilldownConfigProps {
+  show?: boolean
+  renderDrilldown?: (v: any) => JSX.Element
+}
+export interface ZoomnConfigProps {
+  show?: boolean
+  matchPoint?: boolean
+}
+export interface TooltipConfigProps {
+  show?: boolean
+}
+
+
+export interface PublicShareConfig {
+  fixedFilterTag?: string[]
+  fixedTokentag?: ChartSearchToken[]
+  fixedFilterTagNot?: string[]
+  fixedTimeSearch?: Search
+  fixedViewChart?: string
+}

src/dashboard/core/dashboardContext.ts

@@ -82,4 +82,8 @@ import { DrilldownVariable, DrilldownVariableItem } from '../components/drilldown'
   customHandleEvent?: CustomHandleEventProps[]
+  /**
+   *分享
+   */
+   publicShare?: boolean
 }
 
 export interface DashboardContextProps extends DashboardBaseContextProps, DashboardConfig {}

src/dashboard/core/dashboardStaticObj.ts

@@ -1,7 +0,13 @@
-import { UseObserverSizeRect } from "../../hooks"
-import { AddShapeHolderRef, PreviewHolderRef, HelpLineRef, DashboardOverylayRef } from "../layout"
+import { UseObserverSizeRect } from '../../hooks'
+import { AddShapeHolderRef, PreviewHolderRef, HelpLineRef, DashboardOverylayRef } from '../layout'
 import { LogRequestQueueBase } from '../utils'
-import { DashboardChart, ChartSearchToken, DashboardLayoutType, DashboardConfig } from "./dashboardChart"
-import { DashboardEventBase } from "../event"
-import { EditOptions } from "../topbar"
+import {
+  DashboardChart,
+  ChartSearchToken,
+  DashboardLayoutType,
+  DashboardConfig,
+  PublicShareConfig,
+} from './dashboardChart'
+import { DashboardEventBase } from '../event'
+import { EditOptions } from '../topbar'
 
@@ -13,3 +19,3 @@ export interface DashboardStaticObj {
   dashboardRef: React.RefObject<HTMLElement>
-  dashboardOverviewRef:React.RefObject<HTMLElement>
+  dashboardOverviewRef: React.RefObject<HTMLElement>
   dashboardRectRef: React.RefObject<UseObserverSizeRect>
@@ -43,2 +49,4 @@ tagAreaRef?: React.RefObject<HTMLElement>
   dashboardConfig: DashboardConfig
+  normalLayoutChartsCache?: DashboardChart[] | null | undefined
+  publicShareConfig?: PublicShareConfig
 }

src/dashboard/core/registerChartResource.ts

@@ -6,9 +6,6 @@ import React from 'react'
 import { DataFieldGroup } from '../data'
-import {
-  DashboardChart,
-  DashboardChartState,
-} from './dashboardChart'
+import { DashboardChart, DashboardChartState, ToolsConfig, PluginConfig } from './dashboardChart'
 import { CustomHandleEventProps } from '../event'
 import { DashboardStaticObj } from './dashboardStaticObj'
-import { DrilldownVariable, AnnotationConfigProps } from '../components'
+import { DrilldownVariable } from '../components'
 
@@ -42,3 +39,7 @@ export interface GetOptionBuilderProps {
   cref?: React.MutableRefObject<any>
-  annotationConfig?: AnnotationConfigProps
+  /**
+   * 图表一些plugin和tools的配置
+   */
+  toolsConfig?: ToolsConfig
+  pluginConfig?: PluginConfig
 }
@@ -48,5 +49,5 @@
   dashboardChart: DashboardChart
-  dataFieldGroups: DataFieldGroup[],
-  timeObj: TimeStateObj,
-  isChartEdit: boolean,
+  dataFieldGroups: DataFieldGroup[]
+  timeObj: TimeStateObj
+  isChartEdit: boolean
   // width?: number
@@ -103,6 +104,6 @@ // height?: number
   // 用于在对chart做保存动作之前的数据处理
-  preSaveHandle?: (chart: DashboardChart) => void,
+  preSaveHandle?: (chart: DashboardChart) => void
   // 置灰查询框
   hiddenQueryPanel?: boolean
-  extraApplyHandle?: boolean,
+  extraApplyHandle?: boolean
   // 自定义事件添加变量时，额外的常驻默认变量
@@ -109,0 +110,0 @@ extraDefaultFilterKey?: string[]

src/dashboard/editor/optionsBuilder/types.ts

@@ -12,2 +12,3 @@ import type { SelectProps, AutoCompleteProps } from '@alifd/next/types/select'
   DocumentLinkOption,
+  FieldOption,
   InnerTokenOption,
@@ -166,2 +167,3 @@ NullsConnectValue,
   project?: string
+  fieldOption?: FieldOption,
 }
@@ -168,0 +170,0 @@

src/dashboard/utils/index.ts

 export * from './newDashboard'
 export * from './color'
 export * from './valueMap'
+export * from './dashboardGlobalRuntime'

src/index.ts

@@ -6,1 +6,2 @@ export * from './logsearch'
 export * from './components'
+export * from './api'

src/logsearch/logPreviewer.ts

@@ -14,4 +14,2 @@ export interface IBaseLogPreviewer {
   pageInfo: { page: number; size: number }
-  // 正序反序
-  isReverse: boolean
   onItemClick: (
@@ -23,2 +21,13 @@ originLog: any,
   ) => void
+  // ml 标注映射数组
+  mlList: any[]
+  onMlTagClick: (log: any, props: IMlClickProps) => void
+  onSelection?: (log: any, props: IMlAddProps) => void
+  mlLabelList: Array<{
+    startBg: string
+    endBg: string
+    label: string
+    value: string
+    alias: string
+  }>
 }
@@ -29,1 +38,49 @@ export interface ITableModeProps extends IBaseLogPreviewer {
 }
+
+export interface IMlClickProps {
+  valueTagArr: Array<{
+    start: number
+    end: number
+    type: string[] // 类型
+  }>
+  event: any
+  triggerIndex: number // 触发的项
+  value: string // 点击的文案
+  str: string // 原文
+  key: string
+  mlRootEle: HTMLDivElement | null
+}
+
+export interface IMlClickArgs extends IMlClickProps {
+  targetPosition: {
+    x: number
+    y: number
+  }
+  log: any
+  todoMode: 'add' | 'edit'
+  mlRootEle: HTMLDivElement | null
+}
+export interface IMlSelectionArgs extends IMlSelectionProps {
+  targetPosition: {
+    x: number
+    y: number
+  }
+  log: any
+  todoMode: 'add' | 'edit'
+  mlRootEle: HTMLDivElement | null
+}
+
+export type IMlTodoInfor = IMlSelectionArgs | IMlClickArgs
+
+export interface IMlSelectionProps extends IMlClickProps {
+  isCover: boolean // 是否拖拽覆盖
+  key: string
+}
+
+export type IMlAddProps =
+  | IMlSelectionProps
+  | {
+      event: any
+      isCover: boolean
+      key: string
+    }

No alert changes

Improved metrics

Total package byte prevSize

206983

increased by6.23%

Number of package files

106

increased by6%

Lines of code

7138

increased by6.14%

Dependency changes

• + Added@aliyun-sls/i18n@0.3.8(transitive)

• - Removed@aliyun-sls/i18n@0.3.7-dev-9(transitive)

• Updated@aliyun-sls/i18n@0.3.8