@vitrosoftware/common-ui-ts 1.1.253 → 1.1.255
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.
- package/css/std/controls/date-picker/date-picker.css +231 -12
- package/css/std/controls/field-iterator/field-iterator.css +11 -0
- package/css/std/controls/table-view/table-view-custom-date-edit.css +18 -0
- package/dist/index.css +274 -44
- package/dist/index.js +378 -116
- package/dist/index.js.map +1 -1
- package/dist/src/constants/Attribute.d.ts +1 -0
- package/dist/src/constants/HtmlElement.d.ts +4 -0
- package/dist/src/controls/DatePicker/DatePicker.d.ts +7 -4
- package/dist/src/controls/DatePicker/DatePickerConstants.d.ts +7 -0
- package/dist/src/controls/DatePicker/services/DatePickerService.d.ts +6 -0
- package/dist/src/controls/ExpandControlGroup/ExpandControlGroup.d.ts +2 -0
- package/dist/src/controls/FieldIterator/FieldIterator.d.ts +3 -0
- package/dist/src/controls/FieldIterator/FieldIteratorGroup.d.ts +19 -0
- package/dist/src/controls/FieldIterator/models/FieldIteratorGroup.d.ts +6 -0
- package/dist/src/controls/TableView/TableViewConstants.d.ts +2 -1
- package/dist/src/controls/TimePicker/TimePicker.d.ts +1 -1
- package/dist/src/controls/TimePicker/TimePickerConstants.d.ts +3 -0
- package/dist/src/controls/TimePicker/services/TimePickerService.d.ts +3 -0
- package/dist/src/controls/TimePicker/services/impl/TimePickerServiceImpl.d.ts +5 -0
- package/dist/src/models.d.ts +3 -0
- package/dist/src/services.d.ts +3 -0
- package/lib/kendo/kendo.messages.ru-RU.min.js +15 -6
- package/lib/third-party.js +15 -6
- package/lib/xeokit/xeokit-sdk-2.6.10.es.js +72 -0
- package/package.json +1 -1
- package/src/controls/BimViewer/js/bim-viewer-models.js +29 -0
- package/src/controls/BimViewer/js/bim-viewer.js +61 -3
- package/src/controls/DxfViewer/js/dxf-viewer.js +15 -15
- package/src/controls/PdfViewer/js/pdf-viewer.js +1 -1
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { RefObject } from 'react';
|
|
2
|
+
import { services } from '../../services';
|
|
2
3
|
export interface DatePickerProps {
|
|
3
4
|
name?: string;
|
|
4
5
|
culture?: string;
|
|
5
|
-
value
|
|
6
|
+
value?: string | Date;
|
|
6
7
|
start?: string;
|
|
7
8
|
depth?: string;
|
|
8
9
|
format?: string;
|
|
@@ -18,7 +19,9 @@ export interface DatePickerProps {
|
|
|
18
19
|
isRequired?: boolean;
|
|
19
20
|
position?: string;
|
|
20
21
|
origin?: string;
|
|
21
|
-
|
|
22
|
+
popupContainer?: HTMLElement;
|
|
23
|
+
popupContainerRef?: RefObject<HTMLElement>;
|
|
24
|
+
isTimeSelectEnabled?: boolean;
|
|
22
25
|
isWorkDay?: (date: Date) => any;
|
|
23
26
|
onOpen?: (e: any, container: any) => void;
|
|
24
27
|
onChange?: (value: any, name?: string) => void;
|
|
@@ -27,4 +30,4 @@ export interface DatePickerProps {
|
|
|
27
30
|
onFocus?: (e: any) => void;
|
|
28
31
|
className?: string;
|
|
29
32
|
}
|
|
30
|
-
export declare const DatePicker: React.ForwardRefExoticComponent<DatePickerProps & React.RefAttributes<
|
|
33
|
+
export declare const DatePicker: React.ForwardRefExoticComponent<DatePickerProps & React.RefAttributes<services.DatePickerService>>;
|
|
@@ -10,6 +10,8 @@ interface ExpandControlGroupProps {
|
|
|
10
10
|
className?: string;
|
|
11
11
|
buttonClassName?: string;
|
|
12
12
|
buttonContent?: React.ReactNode;
|
|
13
|
+
button?: React.ReactNode;
|
|
14
|
+
isButtonVisible?: boolean;
|
|
13
15
|
children: React.ReactNode;
|
|
14
16
|
}
|
|
15
17
|
export declare const ExpandControlGroup: (props: ExpandControlGroupProps) => JSX.Element;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { models } from '../../models';
|
|
2
3
|
interface FieldIteratorProps {
|
|
3
4
|
fieldList: any[];
|
|
4
5
|
componentMap: {
|
|
@@ -20,7 +21,9 @@ interface FieldIteratorProps {
|
|
|
20
21
|
maxVisibleCount?: number;
|
|
21
22
|
isReadOnly?: boolean;
|
|
22
23
|
controlData?: any;
|
|
24
|
+
groupList?: models.FieldIteratorGroup[];
|
|
23
25
|
className?: string;
|
|
26
|
+
getIsVisibleGroup?: (isVisible: string | boolean) => Promise<boolean>;
|
|
24
27
|
}
|
|
25
28
|
export declare const FieldIterator: React.ForwardRefExoticComponent<FieldIteratorProps & React.RefAttributes<unknown>>;
|
|
26
29
|
export {};
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
interface FieldIteratorGroupProps {
|
|
3
|
+
label: string;
|
|
4
|
+
isVisible: boolean | string;
|
|
5
|
+
fieldList: string[];
|
|
6
|
+
controlList: {
|
|
7
|
+
[key: string]: any;
|
|
8
|
+
}[];
|
|
9
|
+
componentMap: {
|
|
10
|
+
name: string;
|
|
11
|
+
value: React.FunctionComponent<any>;
|
|
12
|
+
}[];
|
|
13
|
+
getComponent: (component: React.FunctionComponent<any>, control: {
|
|
14
|
+
[key: string]: any;
|
|
15
|
+
}, index: number) => React.ReactNode;
|
|
16
|
+
getIsVisible?: (isVisible: string | boolean) => Promise<boolean>;
|
|
17
|
+
}
|
|
18
|
+
export declare const FieldIteratorGroup: (props: FieldIteratorGroupProps) => JSX.Element;
|
|
19
|
+
export {};
|
|
@@ -13,7 +13,7 @@ interface TimePickerProps {
|
|
|
13
13
|
isRequired?: boolean;
|
|
14
14
|
position?: string;
|
|
15
15
|
origin?: string;
|
|
16
|
-
|
|
16
|
+
popupContainer?: HTMLElement;
|
|
17
17
|
onChange?: (value: any) => void;
|
|
18
18
|
onOpen?: (e: any, container: any) => void;
|
|
19
19
|
onClose?: (e: any, container: any) => void;
|
package/dist/src/models.d.ts
CHANGED
|
@@ -27,6 +27,7 @@ import { QuillRichEditorSettings as _QuillRichEditorSettings } from './controls/
|
|
|
27
27
|
import { TelerikMediaPlayerSettings as _TelerikMediaPlayerSettings } from './controls/VideoViewer/models/TelerikMediaPlayerSettings';
|
|
28
28
|
import { FilePickerItem as _FilePickerItem } from './controls/FilePicker/models/FilePickerItem';
|
|
29
29
|
import { SortItem as _SortItem } from './controls/Filter/models/SortItem';
|
|
30
|
+
import { FieldIteratorGroup as _FieldIteratorGroup } from './controls/FieldIterator/models/FieldIteratorGroup';
|
|
30
31
|
export declare namespace models {
|
|
31
32
|
interface JsTreeViewNode extends _JsTreeViewNode {
|
|
32
33
|
}
|
|
@@ -86,4 +87,6 @@ export declare namespace models {
|
|
|
86
87
|
}
|
|
87
88
|
interface SortItem extends _SortItem {
|
|
88
89
|
}
|
|
90
|
+
interface FieldIteratorGroup extends _FieldIteratorGroup {
|
|
91
|
+
}
|
|
89
92
|
}
|
package/dist/src/services.d.ts
CHANGED
|
@@ -26,6 +26,7 @@ import { TabGroupService as _TabGroupService } from './controls/TabGroup/service
|
|
|
26
26
|
import { DropdownButtonService as _DropdownButtonService } from './controls/DropdownButton/services/DropdownButtonService';
|
|
27
27
|
import { SearchService as _SearchService } from './controls/Search/services/SearchService';
|
|
28
28
|
import { ViewService as _ViewService } from './controls/View/services/ViewService';
|
|
29
|
+
import { DatePickerService as _DatePickerService } from './controls/DatePicker/services/DatePickerService';
|
|
29
30
|
export declare namespace services {
|
|
30
31
|
interface BimViewerService extends _BimViewerService {
|
|
31
32
|
}
|
|
@@ -83,4 +84,6 @@ export declare namespace services {
|
|
|
83
84
|
}
|
|
84
85
|
interface ViewService extends _ViewService {
|
|
85
86
|
}
|
|
87
|
+
interface DatePickerService extends _DatePickerService {
|
|
88
|
+
}
|
|
86
89
|
}
|
|
@@ -22,15 +22,24 @@
|
|
|
22
22
|
|
|
23
23
|
|
|
24
24
|
*/
|
|
25
|
-
!function (e) { "function" == typeof define && define.amd ? define(["kendo.core.min"], e) : e() }(function () {
|
|
25
|
+
!function (e) { "function" == typeof define && define.amd ? define(["kendo.core.min"], e) : e(); }(function () {
|
|
26
|
+
!function (e, t) {
|
|
27
|
+
kendo.ui.Calendar && (kendo.ui.Calendar.prototype.options.messages = e.extend(!0,
|
|
28
|
+
kendo.ui.Calendar.prototype.options.messages,
|
|
29
|
+
{
|
|
30
|
+
today: "Сегодня"
|
|
31
|
+
})),
|
|
26
32
|
kendo.ui.DateTimePicker && (kendo.ui.DateTimePicker.prototype.options.messages = e.extend(!0,
|
|
27
33
|
kendo.ui.DateTimePicker.prototype.options.messages,
|
|
28
34
|
{
|
|
29
|
-
|
|
30
|
-
cancel: "
|
|
31
|
-
now: "
|
|
32
|
-
|
|
33
|
-
|
|
35
|
+
set: "Применить",
|
|
36
|
+
cancel: "Отмена",
|
|
37
|
+
now: "Сейчас",
|
|
38
|
+
today: "Сегодня",
|
|
39
|
+
date: "Дата",
|
|
40
|
+
time: "Время",
|
|
41
|
+
hour: "Час",
|
|
42
|
+
minute: "Минута"
|
|
34
43
|
})),
|
|
35
44
|
kendo.ui.TimePicker && (kendo.ui.TimePicker.prototype.options.messages = e.extend(!0,
|
|
36
45
|
kendo.ui.TimePicker.prototype.options.messages,
|
package/lib/third-party.js
CHANGED
|
@@ -10560,15 +10560,24 @@ e===V?d=C:e===U&&(d=E),r=d(s.offset()/l),o=T(a.minSnap,D(-r*l,a.maxSnap)),r!=a.p
|
|
|
10560
10560
|
|
|
10561
10561
|
|
|
10562
10562
|
*/
|
|
10563
|
-
!function (e) { "function" == typeof define && define.amd ? define(["kendo.core.min"], e) : e() }(function () {
|
|
10563
|
+
!function (e) { "function" == typeof define && define.amd ? define(["kendo.core.min"], e) : e(); }(function () {
|
|
10564
|
+
!function (e, t) {
|
|
10565
|
+
kendo.ui.Calendar && (kendo.ui.Calendar.prototype.options.messages = e.extend(!0,
|
|
10566
|
+
kendo.ui.Calendar.prototype.options.messages,
|
|
10567
|
+
{
|
|
10568
|
+
today: "Сегодня"
|
|
10569
|
+
})),
|
|
10564
10570
|
kendo.ui.DateTimePicker && (kendo.ui.DateTimePicker.prototype.options.messages = e.extend(!0,
|
|
10565
10571
|
kendo.ui.DateTimePicker.prototype.options.messages,
|
|
10566
10572
|
{
|
|
10567
|
-
|
|
10568
|
-
cancel: "
|
|
10569
|
-
now: "
|
|
10570
|
-
|
|
10571
|
-
|
|
10573
|
+
set: "Применить",
|
|
10574
|
+
cancel: "Отмена",
|
|
10575
|
+
now: "Сейчас",
|
|
10576
|
+
today: "Сегодня",
|
|
10577
|
+
date: "Дата",
|
|
10578
|
+
time: "Время",
|
|
10579
|
+
hour: "Час",
|
|
10580
|
+
minute: "Минута"
|
|
10572
10581
|
})),
|
|
10573
10582
|
kendo.ui.TimePicker && (kendo.ui.TimePicker.prototype.options.messages = e.extend(!0,
|
|
10574
10583
|
kendo.ui.TimePicker.prototype.options.messages,
|
|
@@ -41491,6 +41491,78 @@ const letters = {
|
|
|
41491
41491
|
[21, 12]
|
|
41492
41492
|
]
|
|
41493
41493
|
}
|
|
41494
|
+
|
|
41495
|
+
//Vitro
|
|
41496
|
+
,
|
|
41497
|
+
'А': { width: 18, points: [[9, 21], [1, 0], [-1, -1], [9, 21], [17, 0], [-1, -1], [4, 7], [14, 7]] },
|
|
41498
|
+
'Б': { width: 20, points: [[16, 21], [4, 21], [4, 0], [-1, -1], [4, 11], [12, 11], [15, 10], [16, 9], [17, 7], [17, 4], [16, 2], [14, 1], [11, 0], [4, 0]] },
|
|
41499
|
+
'В': { width: 21, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [13, 21], [16, 20], [17, 19], [18, 17], [18, 15], [17, 13], [16, 12], [13, 11], [-1, -1], [4, 11], [13, 11], [16, 10], [17, 9], [18, 7], [18, 4], [17, 2], [16, 1], [13, 0], [4, 0]] },
|
|
41500
|
+
'Г': { width: 18, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [16, 21]] },
|
|
41501
|
+
'Д': { width: 22, points: [[0, 0], [0, 4], [4, 4], [7, 21], [15, 21], [18, 4], [20, 4], [20, 0], [20, 4], [0, 4]] },
|
|
41502
|
+
'Е': { width: 19, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [17, 21], [-1, -1], [4, 11], [12, 11], [-1, -1], [4, 0], [17, 0]] },
|
|
41503
|
+
'Ё': { width: 19, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [17, 21], [-1, -1], [4, 11], [12, 11], [-1, -1], [4, 0], [17, 0], [-1, -1], [7, 24], [7, 26], [-1, -1], [13, 24], [13, 26]] },
|
|
41504
|
+
'Ж': { width: 24, points: [[2, 21], [12, 11], [2, 0], [-1, -1], [22, 21], [12, 11], [22, 0], [-1, -1], [12, 21], [12, 0]] },
|
|
41505
|
+
'З': { width: 20, points: [[4, 18], [6, 20], [9, 21], [13, 21], [16, 20], [18, 18], [18, 15], [17, 13], [15, 12], [12, 11], [15, 10], [17, 9], [18, 7], [18, 4], [16, 2], [13, 1], [9, 0], [6, 1], [4, 3]] },
|
|
41506
|
+
'И': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 0], [18, 21]] },
|
|
41507
|
+
'Й': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 0], [18, 21], [-1, -1], [7, 24], [11, 26], [15, 24]] },
|
|
41508
|
+
'К': { width: 21, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [4, 7], [-1, -1], [9, 12], [18, 0]] },
|
|
41509
|
+
'Л': { width: 20, points: [[2, 0], [6, 21], [18, 21], [18, 0]] },
|
|
41510
|
+
'М': { width: 24, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [12, 0], [-1, -1], [20, 21], [12, 0], [-1, -1], [20, 21], [20, 0]] },
|
|
41511
|
+
'Н': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 11], [18, 11]] },
|
|
41512
|
+
'О': { width: 22, points: [[9, 21], [7, 20], [5, 18], [4, 16], [3, 13], [3, 8], [4, 5], [5, 3], [7, 1], [9, 0], [13, 0], [15, 1], [17, 3], [18, 5], [19, 8], [19, 13], [18, 16], [17, 18], [15, 20], [13, 21], [9, 21]] },
|
|
41513
|
+
'П': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [-1, -1], [4, 21], [18, 21]] },
|
|
41514
|
+
'Р': { width: 21, points: [[4, 21], [4, 0], [-1, -1], [4, 21], [13, 21], [16, 20], [17, 19], [18, 17], [18, 14], [17, 12], [16, 11], [13, 10], [4, 10]] },
|
|
41515
|
+
'С': { width: 21, points: [[18, 16], [17, 18], [15, 20], [13, 21], [9, 21], [7, 20], [5, 18], [4, 16], [3, 13], [3, 8], [4, 5], [5, 3], [7, 1], [9, 0], [13, 0], [15, 1], [17, 3], [18, 5]] },
|
|
41516
|
+
'Т': { width: 16, points: [[8, 21], [8, 0], [-1, -1], [1, 21], [15, 21]] },
|
|
41517
|
+
'У': { width: 18, points: [[1, 21], [9, 11], [9, 0], [-1, -1], [17, 21], [9, 11]] },
|
|
41518
|
+
'Ф': { width: 22, points: [[11, 25], [11, -4], [-1, -1], [6, 21], [16, 21], [19, 20], [20, 18], [21, 15], [21, 7], [20, 4], [19, 2], [16, 1], [6, 1], [3, 2], [2, 4], [1, 7], [1, 15], [2, 18], [3, 20], [6, 21]] },
|
|
41519
|
+
'Х': { width: 20, points: [[3, 21], [17, 0], [-1, -1], [17, 21], [3, 0]] },
|
|
41520
|
+
'Ц': { width: 22, points: [[4, 21], [4, 0], [-1, -1], [18, 21], [18, 0], [20, 0], [20, -5], [-1, -1], [4, 0], [18, 0]] },
|
|
41521
|
+
'Ч': { width: 20, points: [[4, 21], [4, 11], [16, 11], [16, 0], [-1, -1], [16, 21], [16, 11]] },
|
|
41522
|
+
'Ш': { width: 26, points: [[4, 21], [4, 0], [-1, -1], [14, 21], [14, 0], [-1, -1], [24, 21], [24, 0], [-1, -1], [4, 0], [24, 0]] },
|
|
41523
|
+
'Щ': { width: 32, points: [[4, 21], [4, 0], [-1, -1], [14, 21], [14, 0], [-1, -1], [24, 21], [24, 0], [28, 0], [28, -5], [-1, -1], [4, 0], [24, 0]] },
|
|
41524
|
+
'Ъ': { width: 22, points: [[4, 21], [4, 0], [12, 0], [15, 1], [17, 3], [18, 6], [18, 9], [17, 12], [15, 14], [12, 15], [4, 15], [-1, -1], [4, 21], [0, 21]] },
|
|
41525
|
+
'Ы': { width: 26, points: [[4, 21], [4, 0], [12, 0], [15, 1], [17, 3], [18, 6], [18, 9], [17, 12], [15, 14], [12, 15], [4, 15], [-1, -1], [22, 21], [22, 0]] },
|
|
41526
|
+
'Ь': { width: 20, points: [[4, 21], [4, 0], [12, 0], [15, 1], [17, 3], [18, 6], [18, 9], [17, 12], [15, 14], [12, 15], [4, 15]] },
|
|
41527
|
+
'Э': { width: 20, points: [[4, 3], [6, 1], [9, 0], [13, 0], [16, 1], [18, 3], [19, 6], [19, 13], [18, 16], [16, 18], [13, 19], [9, 19], [6, 18], [4, 16], [-1, -1], [6, 10], [19, 10]] },
|
|
41528
|
+
'Ю': { width: 28, points: [[4, 21], [4, 0], [-1, -1], [4, 11], [11, 11], [-1, -1], [20, 21], [23, 20], [25, 18], [26, 15], [26, 6], [25, 3], [23, 1], [20, 0], [15, 0], [12, 1], [10, 3], [9, 6], [9, 15], [10, 18], [12, 20], [15, 21], [20, 21]] },
|
|
41529
|
+
'Я': { width: 20, points: [[2, 0], [10, 11], [-1, -1], [16, 0], [16, 21], [-1, -1], [16, 11], [8, 11], [5, 12], [3, 14], [2, 17], [2, 19], [3, 20], [5, 21], [8, 21], [16, 21]] },
|
|
41530
|
+
|
|
41531
|
+
|
|
41532
|
+
|
|
41533
|
+
'а': { width: 19, points: [[15, 14], [15, 0], [-1, -1], [15, 11], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3]] },
|
|
41534
|
+
'б': { width: 18, points: [[14, 14], [6, 14], [4, 12], [4, 0], [14, 0], [14, 6], [6, 6], [4, 8]] },
|
|
41535
|
+
'в': { width: 17, points: [[4, 14], [4, 0], [-1, -1], [4, 14], [10, 14], [12, 13], [13, 12], [13, 10], [12, 9], [10, 8], [4, 8], [-1, -1], [4, 8], [10, 8], [12, 7], [13, 6], [13, 4], [12, 3], [10, 2], [4, 2]] },
|
|
41536
|
+
'г': { width: 14, points: [[4, 14], [4, 0], [-1, -1], [4, 14], [12, 14]] },
|
|
41537
|
+
'д': { width: 20, points: [[1, 0], [1, 4], [4, 4], [6, 14], [14, 14], [16, 4], [19, 4], [19, 0], [-1, -1], [1, 4], [19, 4]] },
|
|
41538
|
+
'е': { width: 18, points: [[3, 8], [15, 8], [15, 10], [14, 12], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3]] },
|
|
41539
|
+
'ё': { width: 18, points: [[3, 8], [15, 8], [15, 10], [14, 12], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3], [-1, -1], [6, 17], [6, 19], [-1, -1], [12, 17], [12, 19]] },
|
|
41540
|
+
'ж': { width: 22, points: [[2, 14], [11, 7], [2, 0], [-1, -1], [20, 14], [11, 7], [20, 0], [-1, -1], [11, 14], [11, 0]] },
|
|
41541
|
+
'з': { width: 16, points: [[3, 12], [5, 13], [8, 14], [11, 14], [13, 13], [14, 11], [14, 9], [13, 8], [11, 7], [8, 7], [-1, -1], [11, 7], [13, 6], [14, 5], [14, 3], [13, 1], [11, 0], [8, 0], [5, 1], [3, 2]] },
|
|
41542
|
+
'и': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 0], [14, 14]] },
|
|
41543
|
+
'й': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 0], [14, 14], [-1, -1], [6, 17], [9, 19], [12, 17]] },
|
|
41544
|
+
'к': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [4, 7], [14, 14], [-1, -1], [4, 7], [14, 0]] },
|
|
41545
|
+
'л': { width: 18, points: [[2, 0], [6, 14], [14, 14], [14, 0]] },
|
|
41546
|
+
'м': { width: 22, points: [[4, 14], [4, 0], [-1, -1], [4, 14], [11, 0], [-1, -1], [11, 0], [18, 14], [-1, -1], [18, 14], [18, 0]] },
|
|
41547
|
+
'н': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 7], [14, 7]] },
|
|
41548
|
+
'о': { width: 19, points: [[8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3], [16, 6], [16, 8], [15, 11], [13, 13], [11, 14], [8, 14]] },
|
|
41549
|
+
'п': { width: 18, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [-1, -1], [4, 14], [14, 14]] },
|
|
41550
|
+
'р': { width: 19, points: [[4, 14], [4, -7], [-1, -1], [4, 11], [6, 13], [8, 14], [11, 14], [13, 13], [15, 11], [16, 8], [16, 6], [15, 3], [13, 1], [11, 0], [8, 0], [6, 1], [4, 3]] },
|
|
41551
|
+
'с': { width: 18, points: [[15, 11], [13, 13], [11, 14], [8, 14], [6, 13], [4, 11], [3, 8], [3, 6], [4, 3], [6, 1], [8, 0], [11, 0], [13, 1], [15, 3]] },
|
|
41552
|
+
'т': { width: 18, points: [[2, 14], [16, 14], [-1, -1], [9, 14], [9, 0]] },
|
|
41553
|
+
'у': { width: 16, points: [[2, 14], [8, 0], [-1, -1], [14, 14], [8, 0], [6, -4], [4, -6], [2, -7], [1, -7]] },
|
|
41554
|
+
'ф': { width: 20, points: [[10, 18], [10, -4], [-1, -1], [5, 14], [7, 14], [9, 13], [10, 11], [10, 3], [9, 1], [7, 0], [5, 0], [3, 1], [2, 3], [2, 11], [3, 13], [5, 14], [-1, -1], [11, 14], [13, 14], [15, 13], [16, 11], [16, 3], [15, 1], [13, 0], [11, 0]] },
|
|
41555
|
+
'х': { width: 17, points: [[3, 14], [14, 0], [-1, -1], [14, 14], [3, 0]] },
|
|
41556
|
+
'ц': { width: 19, points: [[4, 14], [4, 0], [-1, -1], [14, 14], [14, 0], [16, 0], [16, -4], [-1, -1], [4, 0], [14, 0]] },
|
|
41557
|
+
'ч': { width: 17, points: [[4, 14], [4, 7], [13, 7], [13, 0], [-1, -1], [13, 14], [13, 7]] },
|
|
41558
|
+
'ш': { width: 22, points: [[4, 14], [4, 0], [-1, -1], [11, 14], [11, 0], [-1, -1], [18, 14], [18, 0], [-1, -1], [4, 0], [18, 0]] },
|
|
41559
|
+
'щ': { width: 26, points: [[4, 14], [4, 0], [-1, -1], [11, 14], [11, 0], [-1, -1], [18, 14], [18, 0], [22, 0], [22, -4], [-1, -1], [4, 0], [18, 0]] },
|
|
41560
|
+
'ъ': { width: 16, points: [[4, 14], [4, 0], [9, 0], [11, 1], [12, 3], [12, 5], [11, 7], [9, 8], [4, 8], [-1, -1], [4, 14], [0, 14]] },
|
|
41561
|
+
'ы': { width: 22, points: [[4, 14], [4, 0], [9, 0], [11, 1], [12, 3], [12, 5], [11, 7], [9, 8], [4, 8], [-1, -1], [18, 14], [18, 0]] },
|
|
41562
|
+
'ь': { width: 16, points: [[4, 14], [4, 0], [9, 0], [11, 1], [12, 3], [12, 5], [11, 7], [9, 8], [4, 8]] },
|
|
41563
|
+
'э': { width: 16, points: [[3, 2], [5, 1], [8, 0], [11, 0], [13, 1], [15, 3], [15, 11], [13, 13], [11, 14], [8, 14], [5, 13], [3, 12], [-1, -1], [5, 7], [15, 7]] },
|
|
41564
|
+
'ю': { width: 24, points: [[4, 14], [4, 0], [-1, -1], [4, 7], [9, 7], [-1, -1], [14, 14], [16, 13], [18, 11], [19, 8], [19, 6], [18, 3], [16, 1], [14, 0], [11, 0], [9, 1], [7, 3], [6, 6], [6, 8], [7, 11], [9, 13], [11, 14], [14, 14]] },
|
|
41565
|
+
'я': { width: 16, points: [[3, 0], [8, 7], [-1, -1], [12, 0], [12, 14], [-1, -1], [12, 7], [7, 7], [5, 8], [4, 9], [3, 11], [3, 13], [4, 14], [7, 14], [12, 14]] }
|
|
41494
41566
|
};
|
|
41495
41567
|
|
|
41496
41568
|
/**
|
package/package.json
CHANGED
|
@@ -675,6 +675,35 @@ class VitroModel {
|
|
|
675
675
|
}
|
|
676
676
|
}
|
|
677
677
|
});
|
|
678
|
+
},
|
|
679
|
+
|
|
680
|
+
GetText3DList: function (callback, error, async = true) {
|
|
681
|
+
var paramObj = {};
|
|
682
|
+
|
|
683
|
+
paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
|
|
684
|
+
|
|
685
|
+
var webRelativeUrl = BIMCommon.CreateWebServerUrl();
|
|
686
|
+
$.ajax({
|
|
687
|
+
type: "POST",
|
|
688
|
+
url: webRelativeUrl + "/bimViewer/api/Text3D/Get",
|
|
689
|
+
data: JSON.stringify(paramObj),
|
|
690
|
+
contentType: "application/json; charset=utf-8",
|
|
691
|
+
dataType: "json",
|
|
692
|
+
async: async,
|
|
693
|
+
beforeSend: function (data) {
|
|
694
|
+
},
|
|
695
|
+
error: function (jqXHR, textStatus, errorThrown) {
|
|
696
|
+
if (error) {
|
|
697
|
+
error(jqXHR, textStatus, errorThrown);
|
|
698
|
+
}
|
|
699
|
+
},
|
|
700
|
+
success: function (data, status, jqXHR) {
|
|
701
|
+
//console.log(data);
|
|
702
|
+
if (callback) {
|
|
703
|
+
callback(data);
|
|
704
|
+
}
|
|
705
|
+
}
|
|
706
|
+
});
|
|
678
707
|
}
|
|
679
708
|
|
|
680
709
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.
|
|
1
|
+
import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.255';
|
|
2
2
|
|
|
3
3
|
import {
|
|
4
4
|
Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
|
|
5
5
|
ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
|
|
6
|
-
GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
|
|
6
|
+
GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers, buildVectorTextGeometry
|
|
7
7
|
}
|
|
8
|
-
from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.
|
|
8
|
+
from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.255';
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
//----------------------------------------------------------------------------------------------------------------------
|
|
@@ -1067,6 +1067,8 @@ function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
|
|
|
1067
1067
|
model.vitroModelLoader.largeModel = model;
|
|
1068
1068
|
model.vitroModelLoader.startSmallLoad = true;
|
|
1069
1069
|
|
|
1070
|
+
load3DText(model);
|
|
1071
|
+
|
|
1070
1072
|
$('#btnToggleSectionPlan').addClass('toggled');
|
|
1071
1073
|
}
|
|
1072
1074
|
else {
|
|
@@ -1092,6 +1094,62 @@ function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
|
|
|
1092
1094
|
return model;
|
|
1093
1095
|
}
|
|
1094
1096
|
|
|
1097
|
+
|
|
1098
|
+
function load3DText(model) {
|
|
1099
|
+
BIMModel.GetText3DList(
|
|
1100
|
+
(data) => {
|
|
1101
|
+
var entityList = [];
|
|
1102
|
+
|
|
1103
|
+
data.forEach(obj => {
|
|
1104
|
+
var text = buildVectorTextGeometry({
|
|
1105
|
+
origin: [obj.x, obj.y, obj.z],
|
|
1106
|
+
text: obj.value + ""
|
|
1107
|
+
});
|
|
1108
|
+
|
|
1109
|
+
var mesh = model.createMesh({
|
|
1110
|
+
id: model.id + ".text." + obj.id,
|
|
1111
|
+
primitive: "lines",
|
|
1112
|
+
positions: text.positions,
|
|
1113
|
+
indices: text.indices,
|
|
1114
|
+
origin: [0.0, 0.0, 0.0],
|
|
1115
|
+
matrix: obj.matrix,
|
|
1116
|
+
color: [0, 0, 0]
|
|
1117
|
+
});
|
|
1118
|
+
|
|
1119
|
+
var entity = model._entities[obj.entityId];
|
|
1120
|
+
|
|
1121
|
+
if (entity) {
|
|
1122
|
+
entity.meshes.push(mesh);
|
|
1123
|
+
delete model._unusedMeshes[mesh.id];
|
|
1124
|
+
|
|
1125
|
+
entityList.push(entity);
|
|
1126
|
+
}
|
|
1127
|
+
});
|
|
1128
|
+
|
|
1129
|
+
model.layerList.forEach(layer => { layer.finalize(); });
|
|
1130
|
+
|
|
1131
|
+
//model._layersToFinalize = []; for new xeokit
|
|
1132
|
+
|
|
1133
|
+
entityList.forEach(e => {
|
|
1134
|
+
|
|
1135
|
+
e.meshes.forEach(m => {
|
|
1136
|
+
m._finalize(e._flags);
|
|
1137
|
+
m._setVisible(e._flags);
|
|
1138
|
+
});
|
|
1139
|
+
});
|
|
1140
|
+
|
|
1141
|
+
model.glRedraw();
|
|
1142
|
+
model._layersFinalized = true;
|
|
1143
|
+
|
|
1144
|
+
viewer.scene.canvas.spinner.processes--;
|
|
1145
|
+
},
|
|
1146
|
+
(error) => {
|
|
1147
|
+
viewer.scene.canvas.spinner.processes--;
|
|
1148
|
+
}
|
|
1149
|
+
);
|
|
1150
|
+
}
|
|
1151
|
+
|
|
1152
|
+
|
|
1095
1153
|
function isPointCloud(filename) {
|
|
1096
1154
|
const ext = filename.split('.').pop().toLowerCase();
|
|
1097
1155
|
return ext === 'las' || ext === 'laz';
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.
|
|
2
|
-
import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.
|
|
3
|
-
import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.
|
|
4
|
-
import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.
|
|
5
|
-
import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.
|
|
6
|
-
import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.
|
|
7
|
-
import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.
|
|
8
|
-
import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.
|
|
9
|
-
import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.
|
|
10
|
-
import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.
|
|
11
|
-
import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.
|
|
12
|
-
import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.
|
|
13
|
-
import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.
|
|
14
|
-
import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.
|
|
15
|
-
import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.
|
|
1
|
+
import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.255';
|
|
2
|
+
import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.255';
|
|
3
|
+
import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.255';
|
|
4
|
+
import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.255';
|
|
5
|
+
import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.255';
|
|
6
|
+
import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.255';
|
|
7
|
+
import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.255';
|
|
8
|
+
import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.255';
|
|
9
|
+
import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.255';
|
|
10
|
+
import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.255';
|
|
11
|
+
import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.255';
|
|
12
|
+
import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.255';
|
|
13
|
+
import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.255';
|
|
14
|
+
import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.255';
|
|
15
|
+
import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.255'
|
|
16
16
|
|
|
17
17
|
let treeViewData = [];
|
|
18
18
|
let notes = [];
|
|
@@ -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.
|
|
21211
|
+
value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.255",
|
|
21212
21212
|
kind: OptionKind.WORKER
|
|
21213
21213
|
}
|
|
21214
21214
|
};
|