@vitrosoftware/common-ui-ts 1.1.217 → 1.1.219

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,4 +9,5 @@ export declare class SERVICE {
9
9
  static readonly CONTENT_TYPE = "ContentTypeService";
10
10
  static readonly LOOKUP_LIST_ITEM = "LookupListItemService";
11
11
  static readonly ITEM_SELECT_DIALOG = "ItemSelectDialogService";
12
+ static readonly AJAX = "AjaxService";
12
13
  }
@@ -5,10 +5,6 @@ interface AlertProps {
5
5
  text?: string;
6
6
  type: TYPE;
7
7
  setMessage?: any;
8
- actionList?: {
9
- text: string;
10
- onClick: () => any;
11
- }[];
12
8
  onClose?: () => any;
13
9
  isDismissible?: boolean;
14
10
  isMultiline?: boolean;
@@ -35,5 +35,6 @@ export interface DialogProps {
35
35
  hiddenContent?: React.ReactNode;
36
36
  zIndex?: number;
37
37
  children?: React.ReactNode;
38
+ key?: string;
38
39
  }
39
40
  export declare const Dialog: (props: DialogProps) => JSX.Element;
@@ -1,4 +1,5 @@
1
1
  /// <reference types="react" />
2
+ import { interfaces } from 'inversify';
2
3
  import { models } from '../../models';
3
4
  import { services } from '../../services';
4
5
  export declare const TableView: (props: TableViewProps) => JSX.Element;
@@ -24,4 +25,5 @@ export interface TableViewProps {
24
25
  isReadOnly?: boolean;
25
26
  isNoVScroll?: boolean;
26
27
  className?: string;
28
+ container?: interfaces.Container;
27
29
  }
@@ -144,7 +144,10 @@ export declare enum ATTRIBUTE {
144
144
  ADDED = "Added",
145
145
  FORMULA = "Formula",
146
146
  FORMAT = "Format",
147
- SPAN = "Span"
147
+ SPAN = "Span",
148
+ LANG = "Lang",
149
+ GMT = "GMT",
150
+ ACTIONS = "Actions"
148
151
  }
149
152
  export declare enum DRAG_ITEM_TYPE {
150
153
  CANNOT_DROP = 0,
@@ -0,0 +1,21 @@
1
+ import type { TableViewEventHandler } from '../TableViewEventHandler';
2
+ import type { TableViewService } from '../TableViewService';
3
+ import type { AjaxService } from '../../../../services/AjaxService';
4
+ import { EVENT } from '../../TableViewConstants';
5
+ export declare class TableViewOnCustomAjaxServiceImpl implements TableViewEventHandler {
6
+ readonly id = EVENT.ON_CUSTOM_AJAX;
7
+ private readonly data;
8
+ private readonly dataRequestUrl;
9
+ private readonly dataResultString;
10
+ private readonly getRequest;
11
+ private readonly treeGrid;
12
+ private readonly api;
13
+ private readonly cacheVersionParam;
14
+ private readonly ajaxService;
15
+ constructor(ajaxService: AjaxService);
16
+ process(tableView: TableViewService, source: {
17
+ Url: string;
18
+ Method: string;
19
+ }, data: string, func: Function): boolean;
20
+ private getTreeGridFileUrl;
21
+ }
@@ -18,5 +18,4 @@ export interface Item extends ItemId {
18
18
  readonly updateUser: any;
19
19
  readonly deleteUser: any;
20
20
  view?: ContentTypeView;
21
- isNew?: boolean;
22
21
  }
@@ -4,4 +4,6 @@ export interface ItemId {
4
4
  readonly listId: string;
5
5
  readonly parentId: string;
6
6
  readonly siteId: string;
7
+ isNew: boolean;
8
+ readonly refItemField?: string;
7
9
  }
@@ -0,0 +1,4 @@
1
+ export interface AjaxService {
2
+ get(url: string | string[], scope?: string): Promise<any>;
3
+ post(url: string | string[], data?: any, scope?: string, onError?: (response: any) => void): Promise<any>;
4
+ }
@@ -1,5 +1,5 @@
1
1
  export interface ItemSelectDialogService {
2
- show(listId: string, viewId?: string, isMultiSelect?: boolean, isFolderOnly?: boolean, dialogSettings?: {
2
+ show(listId: string, viewId?: string, isMultiSelect?: boolean, isFolderOnly?: boolean, isFileOnly?: boolean, dialogSettings?: {
3
3
  title?: string;
4
4
  subtitle?: string;
5
5
  image?: string;
@@ -882,7 +882,7 @@ export const OrbitControls = function ( object, domElement ) {
882
882
 
883
883
  case 1:
884
884
 
885
- mouseAction = scope.mouseButtons.MIDDLE;
885
+ mouseAction = scope.mouseButtons.RIGHT;
886
886
  break;
887
887
 
888
888
  case 2:
@@ -1022,7 +1022,11 @@ export const OrbitControls = function ( object, domElement ) {
1022
1022
 
1023
1023
  function onMouseWheel( event ) {
1024
1024
 
1025
- if ( scope.enabled === false || scope.enableZoom === false || ( state !== STATE.NONE && state !== STATE.ROTATE ) ) return;
1025
+ if (scope.enabled === false || scope.enableZoom === false || (state !== STATE.NONE && state !== STATE.ROTATE)) return;
1026
+
1027
+ if (window.dxfViewer?.options && event.isTrusted) {
1028
+ window.dxfViewer.options.autoZoom = false;
1029
+ }
1026
1030
 
1027
1031
  event.preventDefault();
1028
1032
  event.stopPropagation();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vitrosoftware/common-ui-ts",
3
- "version": "1.1.217",
3
+ "version": "1.1.219",
4
4
  "description": "vitro software common ui ts",
5
5
  "author": "",
6
6
  "license": "MIT",
@@ -1,11 +1,11 @@
1
- import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.217';
1
+ import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.219';
2
2
 
3
3
  import {
4
4
  Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
5
5
  ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
6
6
  GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
7
7
  }
8
- from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.217';
8
+ from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.219';
9
9
 
10
10
 
11
11
  //----------------------------------------------------------------------------------------------------------------------
@@ -1,17 +1,17 @@
1
- import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.217';
2
- import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.217';
3
- import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.217';
4
- import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.217';
5
- import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.217';
6
- import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.217';
7
- import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.217';
8
- import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.217';
9
- import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.217';
10
- import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.217';
11
- import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.217';
12
- import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.217';
13
- import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.217';
14
- import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.217';
1
+ import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.219';
2
+ import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.219';
3
+ import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.219';
4
+ import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.219';
5
+ import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.219';
6
+ import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.219';
7
+ import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.219';
8
+ import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.219';
9
+ import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.219';
10
+ import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.219';
11
+ import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.219';
12
+ import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.219';
13
+ import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.219';
14
+ import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.219';
15
15
 
16
16
  let treeViewData = [];
17
17
  let notes = [];
@@ -1195,7 +1195,8 @@ export class Viewer extends DxfViewer {
1195
1195
  options.colorCorrection = true
1196
1196
  options.clearColor = new three.Color("#fff")
1197
1197
  options.buildScene = true
1198
- options.retainParsedDxf = true
1198
+ options.retainParsedDxf = true,
1199
+ options.autoZoom = true
1199
1200
  }
1200
1201
 
1201
1202
  super(domContainer, options)
@@ -1573,13 +1574,13 @@ export class Viewer extends DxfViewer {
1573
1574
  deltaY: 1,
1574
1575
  deltaMode: 0
1575
1576
  })
1576
- this.canvas.dispatchEvent(wheelEvent)
1577
+ this.canvas.dispatchEvent(wheelEvent);
1577
1578
  wheelEvent = new WheelEvent('wheel', {
1578
1579
  deltaY: -1,
1579
1580
  deltaMode: 0,
1580
1581
  position: [0, 0, 0]
1581
1582
  })
1582
- this.canvas.dispatchEvent(wheelEvent)
1583
+ this.canvas.dispatchEvent(wheelEvent);
1583
1584
  }
1584
1585
 
1585
1586
  RenderVieports(space) {
@@ -1964,6 +1965,7 @@ export class Viewer extends DxfViewer {
1964
1965
  }
1965
1966
 
1966
1967
  ZoomIn(scale) {
1968
+ this.options.autoZoom = false;
1967
1969
  const centerX = this.canvasWidth / 2 * window.devicePixelRatio;
1968
1970
  const centerY = this.canvasHeight / 2 * window.devicePixelRatio;
1969
1971
  scale = scale ? scale : Math.pow(0.95, 3);
@@ -1972,6 +1974,7 @@ export class Viewer extends DxfViewer {
1972
1974
  }
1973
1975
 
1974
1976
  ZoomOut(scale) {
1977
+ this.options.autoZoom = false;
1975
1978
  const centerX = this.canvasWidth / 2 * window.devicePixelRatio;
1976
1979
  const centerY = this.canvasHeight / 2 * window.devicePixelRatio;
1977
1980
  scale = scale ? scale : Math.pow(0.95, 3);
@@ -3266,24 +3269,35 @@ for (const eventName of ['loaded', 'cleared', 'destroyed', 'resized', 'pointerdo
3266
3269
  Subscribe(eventName);
3267
3270
  }
3268
3271
 
3272
+ let lastWheelClickTime = 0;
3273
+ const wheelDblClickThreshold = 400;
3274
+
3269
3275
  function emit(eventName, event) {
3270
3276
  if (eventName == 'dxf-pointerdown' && event.detail.domEvent.button == 1) {
3271
- var layout = null;
3272
- const viewer = window.dxfViewer;
3273
- const scene = viewer.scene;
3274
- for (let i = 0; i < scene.layouts.length; i++) {
3275
- if (window.dxfViewer.spaceName === scene.layouts[i].space) {
3276
- if (i == scene.layouts.length - 1)
3277
- layout = scene.layouts[0];
3278
- else
3279
- layout = scene.layouts[i + 1];
3280
-
3281
- break;
3277
+ const now = Date.now();
3278
+ if (now - lastWheelClickTime < wheelDblClickThreshold) {
3279
+ doZoomAuto();
3280
+ lastWheelClickTime = 0;
3281
+ } else {
3282
+ lastWheelClickTime = now;
3283
+
3284
+ var layout = null;
3285
+ const viewer = window.dxfViewer;
3286
+ const scene = viewer.scene;
3287
+ for (let i = 0; i < scene.layouts.length; i++) {
3288
+ if (window.dxfViewer.spaceName === scene.layouts[i].space) {
3289
+ if (i == scene.layouts.length - 1)
3290
+ layout = scene.layouts[0];
3291
+ else
3292
+ layout = scene.layouts[i + 1];
3293
+
3294
+ break;
3295
+ }
3282
3296
  }
3283
- }
3284
3297
 
3285
- if (layout) {
3286
-
3298
+ if (layout) {
3299
+
3300
+ }
3287
3301
  }
3288
3302
  }
3289
3303
  else if (eventName == 'dxf-pointerdown' && event.detail.domEvent.button == 0) {
@@ -3331,7 +3345,7 @@ function emit(eventName, event) {
3331
3345
  }
3332
3346
  }
3333
3347
  else if (eventName == 'dxf-viewChanged') {
3334
- if (+$('#scaleSelect').data('value') && dxfViewer.camera.zoom !== 1) {
3348
+ if (dxfViewer.camera.zoom !== 1 && !window.dxfViewer.options.autoZoom) {
3335
3349
  updateScaleSelectValue();
3336
3350
  }
3337
3351
  anno.UpdateLabelPosition();
@@ -3570,12 +3584,17 @@ function doZoomPageFit() {
3570
3584
  function doZoomAuto() {
3571
3585
  doZoomPageFit();
3572
3586
  window.dxfViewer.DoFakeZoomToRedrawScene();
3587
+ $('#pageAutoOption').text(context.scaleAutoLabel);
3588
+ $('#scaleSelect').data('value', $('#scaleSelect').val());
3589
+ $('#scaleSelect').val(context.scaleAutoLabel);
3573
3590
  }
3574
3591
 
3575
3592
  function changeZoom(scale) {
3576
3593
  if (scale === 'auto') {
3594
+ window.dxfViewer.options.autoZoom = true;
3577
3595
  doZoomAuto();
3578
3596
  } else {
3597
+ window.dxfViewer.options.autoZoom = false;
3579
3598
  scale = +scale;
3580
3599
  if (scale === 1) {
3581
3600
  doZoomPageFit();
@@ -21208,7 +21208,7 @@ const defaultOptions = {
21208
21208
  kind: OptionKind.WORKER
21209
21209
  },
21210
21210
  workerSrc: {
21211
- value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.217",
21211
+ value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.219",
21212
21212
  kind: OptionKind.WORKER
21213
21213
  }
21214
21214
  };