gs-cae-design 1.1.66 → 1.1.67
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/README.md +22 -0
- package/lib/.gz +0 -0
- package/lib/CAEDesign.common-report.html +2 -2
- package/lib/CAEDesign.common.js +27 -27
- package/lib/CAEDesign.umd-report.html +2 -2
- package/lib/CAEDesign.umd.js +27 -27
- package/lib/CAEDesign.umd.min-report.html +2 -2
- package/lib/CAEDesign.umd.min.js +27 -27
- package/package.json +1 -1
- package/src/caeCardEditor/caeCardObjects/cardObject.ts +31 -17
- package/src/gsDevFx/objects/caeObjects/optionObjects/modelOptions.ts +5 -3
- package/src/gsDevFx/objects/caeObjects/pretreatment/corrzObject.ts +37 -7
- package/src/gsDevFx/objects/pretreatmentObjects/colorDivHeightObject.ts +6 -6
- package/src/viewerWrapper/commands/createMember/memberConfig.ts +16 -5
- package/src/viewerWrapper/commands/createPlate/commandCreatePlate.ts +6 -0
- package/src/viewerWrapper/commands/createPlate/plateConfig.ts +16 -5
- package/src/viewerWrapper/commands/createPlatesInRange/createPlatesInRangeConfig.ts +16 -6
- package/src/viewerWrapper/commands/createXBracing/xBracingConfig.ts +32 -11
- package/src/viewerWrapper/commands/deleteMember/commandDeleteMember.ts +29 -0
- package/src/viewerWrapper/commands/pretreatment/colorDivideByEditComponentGroup/colorDivideByEditComponentGroupConfig.ts +6 -6
- package/src/viewerWrapper/commands/pretreatment/colorDivideByGrupName/colorDivideByGrupNameConfig.ts +7 -4
- package/src/viewerWrapper/commands/pretreatment/colorDivideByGrupThickness/colorDivideByGrupThicknessConfig.ts +39 -37
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/cardObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.d.ts +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/optionObjects/modelOptions.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/pretreatment/corrzObject.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/createMember/memberConfig.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/createPlate/commandCreatePlate.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/createPlate/plateConfig.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/createPlatesInRange/createPlatesInRangeConfig.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/createXBracing/xBracingConfig.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/deleteMember/commandDeleteMember.d.ts +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/deleteMember/commandDeleteMember.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/colorDivideByGrupName/colorDivideByGrupNameConfig.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/colorDivideByGrupThickness/colorDivideByGrupThicknessConfig.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/importBoreholes/importBoreholesConfig.d.ts +6 -0
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/importWave/commandImportWave.d.ts.map +1 -0
- package/types/ceecDesign/src/api/projectServices.d.ts +0 -8
- package/types/ceecDesign/src/api/projectServices.d.ts.map +0 -1
- package/types/ceecDesign/src/gsDevFx/managers/cloneManager.d.ts +0 -5
- package/types/ceecDesign/src/gsDevFx/managers/structureTreeManager.d.ts.map +1 -0
- package/types/ceecDesign/src/gsDevFx/objects/designBaseObject.d.ts +0 -53
- package/types/ceecDesign/src/gsDevFx/objects/designBaseObject.d.ts.map +0 -1
- package/types/ceecDesign/src/gsDevFx/objects/designLightObject/instanceDesignLightObject.d.ts +9 -0
- package/types/ceecDesign/src/gsDevFx/operators/objectPreSelector.d.ts.map +0 -1
- package/types/ceecDesign/src/gsDevFx/viewer.d.ts +0 -14
- package/types/ceecDesign/src/gsDevFx/viewer.d.ts.map +0 -1
- package/types/ceecDesign/src/index.d.ts +0 -37
- package/types/ceecDesign/src/plugins/svgDraw/index.d.ts +0 -17
- package/types/ceecDesign/src/plugins/svgDraw/index.d.ts.map +0 -1
- package/types/ceecDesign/src/plugins/svgDraw/svgViewer.d.ts +0 -21
- package/types/ceecDesign/src/plugins/svgDraw/svgViewer.d.ts.map +0 -1
package/package.json
CHANGED
|
@@ -39,26 +39,39 @@ export class CardObject {
|
|
|
39
39
|
hasData = true;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
let value =
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
let value =
|
|
43
|
+
this[key].value === 0 || this[key].value
|
|
44
|
+
? this[key].value.toString().trimEnd().trim()
|
|
45
|
+
: "";
|
|
45
46
|
|
|
46
|
-
let result = value;
|
|
47
|
+
let result = value as string;
|
|
47
48
|
|
|
48
49
|
if (result) {
|
|
49
|
-
let num = Number(result);
|
|
50
50
|
let axlen = this[key].range[1] - this[key].range[0];
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
result = num.toExponential(axlen - 4).toString();
|
|
56
|
-
result = (result as string).replace("e", "");
|
|
57
|
-
}
|
|
51
|
+
if (result.length > axlen && axlen <= 5) {
|
|
52
|
+
// 数值位数超出卡片限制的长度,则导出为""
|
|
53
|
+
result = "";
|
|
54
|
+
hasData = false;
|
|
58
55
|
} else {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
56
|
+
let num = Number(result);
|
|
57
|
+
// 最多保留三位小数
|
|
58
|
+
num = Number(num.toFixed(3));
|
|
59
|
+
// 转科学计数法
|
|
60
|
+
let resultExp = num.toExponential();
|
|
61
|
+
// 单独提取指数
|
|
62
|
+
let fix = Math.abs(Number((resultExp as string).split("e")[1]));
|
|
63
|
+
if (num > 0) {
|
|
64
|
+
// 正数
|
|
65
|
+
if (fix > axlen - 1) {
|
|
66
|
+
result = num.toExponential(axlen - 4).toString();
|
|
67
|
+
result = (result as string).replace("e", "");
|
|
68
|
+
}
|
|
69
|
+
} else {
|
|
70
|
+
// 负数
|
|
71
|
+
if (fix > axlen - 2) {
|
|
72
|
+
result = num.toExponential(axlen - 5).toString();
|
|
73
|
+
result = (result as string).replace("e", "");
|
|
74
|
+
}
|
|
62
75
|
}
|
|
63
76
|
}
|
|
64
77
|
}
|
|
@@ -67,9 +80,10 @@ export class CardObject {
|
|
|
67
80
|
result += ".";
|
|
68
81
|
}
|
|
69
82
|
|
|
70
|
-
|
|
83
|
+
// 补满空格.
|
|
84
|
+
let roopTime = this[key].range[1] - this[key].range[0] - result.length;
|
|
71
85
|
let space = "";
|
|
72
|
-
for (let i = 0; i <
|
|
86
|
+
for (let i = 0; i < roopTime; i++) {
|
|
73
87
|
space += " ";
|
|
74
88
|
}
|
|
75
89
|
result = space + result;
|
|
@@ -53,10 +53,12 @@ export class ModelOptions extends DesignBaseObject {
|
|
|
53
53
|
serializeToCard() {
|
|
54
54
|
let result = null;
|
|
55
55
|
|
|
56
|
-
if (
|
|
57
|
-
this.cardObject.units.value
|
|
56
|
+
if (this.cardObject) {
|
|
57
|
+
if (!this.cardObject.units.value) {
|
|
58
|
+
this.cardObject.units.value = "MN";
|
|
59
|
+
}
|
|
60
|
+
result = this.cardObject.getLine();
|
|
58
61
|
}
|
|
59
|
-
result = this.cardObject.getLine();
|
|
60
62
|
|
|
61
63
|
return result;
|
|
62
64
|
}
|
|
@@ -33,19 +33,19 @@ export class CorrzObject extends DesignBaseObject {
|
|
|
33
33
|
/**
|
|
34
34
|
* 最大作用壁厚
|
|
35
35
|
*/
|
|
36
|
-
maxThickness: string= "";
|
|
36
|
+
maxThickness: string = "";
|
|
37
37
|
/**
|
|
38
38
|
* 最小剩余壁厚
|
|
39
39
|
*/
|
|
40
|
-
minCorrodedThickness: string= "";
|
|
40
|
+
minCorrodedThickness: string = "";
|
|
41
41
|
/**
|
|
42
42
|
* 浪流荷载选项
|
|
43
43
|
*/
|
|
44
|
-
memberLoadOption: string= "";
|
|
44
|
+
memberLoadOption: string = "";
|
|
45
45
|
/**
|
|
46
46
|
* 垂向坐标
|
|
47
47
|
*/
|
|
48
|
-
verticalCoord: string= "";
|
|
48
|
+
verticalCoord: string = "";
|
|
49
49
|
/**
|
|
50
50
|
* 分色颜色
|
|
51
51
|
*/
|
|
@@ -150,11 +150,15 @@ export class CorrzObject extends DesignBaseObject {
|
|
|
150
150
|
card.bottomOfZone.value = checkNotNullOrUndefinded(this.bottomOfZone)
|
|
151
151
|
? this.bottomOfZone.toString()
|
|
152
152
|
: "";
|
|
153
|
-
card.topOfZone.value = checkNotNullOrUndefinded(this.topOfZone)
|
|
153
|
+
card.topOfZone.value = checkNotNullOrUndefinded(this.topOfZone)
|
|
154
|
+
? this.topOfZone.toString()
|
|
155
|
+
: "";
|
|
154
156
|
card.corrosionZoneOption.value = this.corrosIonOption
|
|
155
157
|
? this.corrosIonOption.toString()
|
|
156
158
|
: "";
|
|
157
|
-
card.level_bottomOfZone.value = checkNotNullOrUndefinded(
|
|
159
|
+
card.level_bottomOfZone.value = checkNotNullOrUndefinded(
|
|
160
|
+
this.thicknessBottom
|
|
161
|
+
)
|
|
158
162
|
? this.thicknessBottom.toString()
|
|
159
163
|
: "";
|
|
160
164
|
card.level_topOfZone.value = checkNotNullOrUndefinded(this.thicknessTop)
|
|
@@ -170,7 +174,33 @@ export class CorrzObject extends DesignBaseObject {
|
|
|
170
174
|
? this.minCorrodedThickness.toString()
|
|
171
175
|
: "";
|
|
172
176
|
card.memberLoadOption.value = this.memberLoadOption;
|
|
173
|
-
|
|
177
|
+
switch (this.verticalCoord) {
|
|
178
|
+
case "0":
|
|
179
|
+
{
|
|
180
|
+
card.verticalCoord.value = "";
|
|
181
|
+
}
|
|
182
|
+
break;
|
|
183
|
+
case "1":
|
|
184
|
+
{
|
|
185
|
+
card.verticalCoord.value = "X";
|
|
186
|
+
}
|
|
187
|
+
break;
|
|
188
|
+
case "2":
|
|
189
|
+
{
|
|
190
|
+
card.verticalCoord.value = "Y";
|
|
191
|
+
}
|
|
192
|
+
break;
|
|
193
|
+
case "3":
|
|
194
|
+
{
|
|
195
|
+
card.verticalCoord.value = "Z";
|
|
196
|
+
}
|
|
197
|
+
break;
|
|
198
|
+
default:
|
|
199
|
+
{
|
|
200
|
+
card.verticalCoord.value = "";
|
|
201
|
+
}
|
|
202
|
+
break;
|
|
203
|
+
}
|
|
174
204
|
|
|
175
205
|
return card.getLine();
|
|
176
206
|
}
|
|
@@ -283,7 +283,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
|
|
|
283
283
|
) {
|
|
284
284
|
// 区域在杆件内,且下部
|
|
285
285
|
distances.push(0);
|
|
286
|
-
distances.push((top - memberBottom) / Math.cos(angle));
|
|
286
|
+
distances.push((top - memberBottom) / Math.abs(Math.cos(angle)));
|
|
287
287
|
|
|
288
288
|
let color = this.getColorByIndex(colors, i / 2);
|
|
289
289
|
color = this.checkColorIsTemp(color, member);
|
|
@@ -292,7 +292,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
|
|
|
292
292
|
// 区域在杆件中间
|
|
293
293
|
if (distances.length === 0) {
|
|
294
294
|
distances.push(0);
|
|
295
|
-
distances.push((bottom - memberBottom) / Math.cos(angle));
|
|
295
|
+
distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
|
|
296
296
|
divColors.push(member.faceColor[0] / 255);
|
|
297
297
|
divColors.push(member.faceColor[1] / 255);
|
|
298
298
|
divColors.push(member.faceColor[2] / 255);
|
|
@@ -303,8 +303,8 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
|
|
|
303
303
|
divColors.push(member.faceColor[3]);
|
|
304
304
|
}
|
|
305
305
|
|
|
306
|
-
distances.push((bottom - memberBottom) / Math.cos(angle));
|
|
307
|
-
distances.push((top - memberBottom) / Math.cos(angle));
|
|
306
|
+
distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
|
|
307
|
+
distances.push((top - memberBottom) / Math.abs(Math.cos(angle)));
|
|
308
308
|
|
|
309
309
|
let color = this.getColorByIndex(colors, i / 2);
|
|
310
310
|
color = this.checkColorIsTemp(color, member);
|
|
@@ -316,7 +316,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
|
|
|
316
316
|
) {
|
|
317
317
|
if (distances.length === 0) {
|
|
318
318
|
distances.push(0);
|
|
319
|
-
distances.push((bottom - memberBottom) / Math.cos(angle));
|
|
319
|
+
distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
|
|
320
320
|
divColors.push(member.faceColor[0] / 255);
|
|
321
321
|
divColors.push(member.faceColor[1] / 255);
|
|
322
322
|
divColors.push(member.faceColor[2] / 255);
|
|
@@ -327,7 +327,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
|
|
|
327
327
|
divColors.push(member.faceColor[3]);
|
|
328
328
|
}
|
|
329
329
|
|
|
330
|
-
distances.push((bottom - memberBottom) / Math.cos(angle));
|
|
330
|
+
distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
|
|
331
331
|
distances.push(member.getMemberLength());
|
|
332
332
|
|
|
333
333
|
let color = this.getColorByIndex(colors, i / 2);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Config } from "./../../../gsDevFx/propertyComponents/config";
|
|
2
2
|
import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
|
|
3
3
|
import { Process } from "../../../gsDevFx/process";
|
|
4
|
+
import { DesignBaseObject } from "gs-ceec-design";
|
|
4
5
|
|
|
5
6
|
export default class MemberConfig extends Config {
|
|
6
7
|
constructor() {
|
|
@@ -58,13 +59,23 @@ export default class MemberConfig extends Config {
|
|
|
58
59
|
let sectionObjectGroup =
|
|
59
60
|
Process.activeProcess.findRenderObjectByName("杆件截面组");
|
|
60
61
|
if (sectionObjectGroup) {
|
|
61
|
-
property.data.sectionGroup.selectOptions.selections =
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
// property.data.sectionGroup.selectOptions.selections =
|
|
63
|
+
// sectionObjectGroup.childObjects.map((item) => {
|
|
64
|
+
// return {
|
|
65
|
+
// label: item.name,
|
|
66
|
+
// value: item.id,
|
|
67
|
+
// };
|
|
68
|
+
// });
|
|
69
|
+
|
|
70
|
+
property.data.sectionGroup.selectOptions.selections = [];
|
|
71
|
+
sectionObjectGroup.childObjects.map((item) => {
|
|
72
|
+
if((item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
73
|
+
property.data.sectionGroup.selectOptions.selections.push({
|
|
64
74
|
label: item.name,
|
|
65
75
|
value: item.id,
|
|
66
|
-
};
|
|
67
|
-
}
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
});
|
|
68
79
|
}
|
|
69
80
|
}
|
|
70
81
|
}
|
|
@@ -229,6 +229,12 @@ export default class CommandCreatePlate extends CommandComponent {
|
|
|
229
229
|
let pGrupObj: PGrupObject = this.viewer.process.findRenderObjectById(
|
|
230
230
|
seletedGrupId
|
|
231
231
|
) as PGrupObject;
|
|
232
|
+
if(!pGrupObj) {
|
|
233
|
+
pGrupObj = this.viewer.process.findRenderObjectByNameInChildObject(
|
|
234
|
+
this.viewer.process.caeRenderObjectTreeManager.pGrupNode,
|
|
235
|
+
seletedGrupId
|
|
236
|
+
) as PGrupObject;
|
|
237
|
+
}
|
|
232
238
|
plateObject.pGrup = pGrupObj;
|
|
233
239
|
// plateObject.plateThickness = CaeNumber(data.thickness.value);
|
|
234
240
|
|
|
@@ -2,6 +2,7 @@ import { Config } from "../../../gsDevFx/propertyComponents/config";
|
|
|
2
2
|
import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
|
|
3
3
|
import { Process } from "../../../gsDevFx/process";
|
|
4
4
|
import { PGrupObject } from "../../../gsDevFx/objects/caeObjects/pGrupObject";
|
|
5
|
+
import { DesignBaseObject } from "gs-ceec-design";
|
|
5
6
|
|
|
6
7
|
export default class PlateConfig extends Config {
|
|
7
8
|
constructor() {
|
|
@@ -70,13 +71,23 @@ export default class PlateConfig extends Config {
|
|
|
70
71
|
let sectionObjectGroup =
|
|
71
72
|
Process.activeProcess.findRenderObjectByName("板截面组");
|
|
72
73
|
if (sectionObjectGroup) {
|
|
73
|
-
property.data.sectionGroup.selectOptions.selections =
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
// property.data.sectionGroup.selectOptions.selections =
|
|
75
|
+
// sectionObjectGroup.childObjects.map((item) => {
|
|
76
|
+
// return {
|
|
77
|
+
// label: item.name,
|
|
78
|
+
// value: item.id,
|
|
79
|
+
// };
|
|
80
|
+
// });
|
|
81
|
+
|
|
82
|
+
property.data.sectionGroup.selectOptions.selections = [];
|
|
83
|
+
sectionObjectGroup.childObjects.map((item) => {
|
|
84
|
+
if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
85
|
+
property.data.sectionGroup.selectOptions.selections.push({
|
|
76
86
|
label: item.name,
|
|
77
87
|
value: item.id,
|
|
78
|
-
};
|
|
79
|
-
}
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
});
|
|
80
91
|
}
|
|
81
92
|
}
|
|
82
93
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
|
|
2
2
|
import { Longan } from "gs-bim-air";
|
|
3
3
|
import { Config } from "../../../gsDevFx/propertyComponents/config";
|
|
4
|
+
import { DesignBaseObject } from "gs-ceec-design";
|
|
4
5
|
|
|
5
6
|
export default class CreatePlatesInRangeConfig extends Config {
|
|
6
7
|
constructor() {
|
|
@@ -53,15 +54,24 @@ export default class CreatePlatesInRangeConfig extends Config {
|
|
|
53
54
|
|
|
54
55
|
let pGrups = Longan.Process.activeProcess.findRenderObjectByName("板截面组");
|
|
55
56
|
if (pGrups) {
|
|
56
|
-
//
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
// property.data.pGrups.selectOptions.selections = pGrups.childObjects.map(
|
|
58
|
+
// (item) => {
|
|
59
|
+
// return {
|
|
60
|
+
// label: item.name,
|
|
61
|
+
// value: item.id,
|
|
62
|
+
// };
|
|
63
|
+
// }
|
|
64
|
+
// );
|
|
65
|
+
|
|
66
|
+
property.data.pGrups.selectOptions.selections = [];
|
|
67
|
+
pGrups.childObjects.map((item) => {
|
|
68
|
+
if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
69
|
+
property.data.pGrups.selectOptions.selections.push({
|
|
60
70
|
label: item.name,
|
|
61
71
|
value: item.id,
|
|
62
|
-
};
|
|
72
|
+
});
|
|
63
73
|
}
|
|
64
|
-
);
|
|
74
|
+
});
|
|
65
75
|
}
|
|
66
76
|
}
|
|
67
77
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DesignBaseObject } from "gs-ceec-design";
|
|
1
2
|
import { Config } from "../../../gsDevFx/propertyComponents/config";
|
|
2
3
|
import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
|
|
3
4
|
import { Longan } from "gs-bim-air";
|
|
@@ -63,23 +64,43 @@ export default class XBracingConfig extends Config {
|
|
|
63
64
|
this.properties.add(property);
|
|
64
65
|
|
|
65
66
|
let sectionObjectGroup =
|
|
66
|
-
|
|
67
|
+
Longan.Process.activeProcess.findRenderObjectByName("杆件截面组");
|
|
67
68
|
if (sectionObjectGroup) {
|
|
68
|
-
property.data.continuousGroup.selectOptions.selections =
|
|
69
|
-
|
|
70
|
-
|
|
69
|
+
// property.data.continuousGroup.selectOptions.selections =
|
|
70
|
+
// sectionObjectGroup.childObjects.map((item) => {
|
|
71
|
+
// return {
|
|
72
|
+
// label: item.name,
|
|
73
|
+
// value: item.id,
|
|
74
|
+
// };
|
|
75
|
+
// });
|
|
76
|
+
|
|
77
|
+
property.data.continuousGroup.selectOptions.selections = [];
|
|
78
|
+
sectionObjectGroup.childObjects.map((item) => {
|
|
79
|
+
if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
80
|
+
property.data.continuousGroup.selectOptions.selections.push({
|
|
71
81
|
label: item.name,
|
|
72
82
|
value: item.id,
|
|
73
|
-
};
|
|
74
|
-
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
// property.data.discontinuousGroup.selectOptions.selections =
|
|
88
|
+
// sectionObjectGroup.childObjects.map((item) => {
|
|
89
|
+
// return {
|
|
90
|
+
// label: item.name,
|
|
91
|
+
// value: item.id,
|
|
92
|
+
// };
|
|
93
|
+
// });
|
|
75
94
|
|
|
76
|
-
property.data.discontinuousGroup.selectOptions.selections =
|
|
77
|
-
|
|
78
|
-
|
|
95
|
+
property.data.discontinuousGroup.selectOptions.selections = [];
|
|
96
|
+
sectionObjectGroup.childObjects.map((item) => {
|
|
97
|
+
if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
98
|
+
property.data.discontinuousGroup.selectOptions.selections.push({
|
|
79
99
|
label: item.name,
|
|
80
100
|
value: item.id,
|
|
81
|
-
};
|
|
82
|
-
}
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
});
|
|
83
104
|
}
|
|
84
105
|
}
|
|
85
106
|
}
|
|
@@ -10,6 +10,7 @@ import { BusinessState } from "gs-ceec-design";
|
|
|
10
10
|
import { SelectorFiliter } from "../../../gsDevFx/managers/interfaceManagers/selectionInterfaceManager";
|
|
11
11
|
import { MemberObject } from "../../../gsDevFx/objects/caeObjects/memberObject";
|
|
12
12
|
import { Longan } from "gs-bim-air";
|
|
13
|
+
import { RenderObject } from "gs-longan/objects/renderObject";
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
16
|
* 删除杆件
|
|
@@ -122,6 +123,9 @@ export default class CommandDeleteMember extends CommandComponent {
|
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
125
|
|
|
126
|
+
// 删除关联分色对象.
|
|
127
|
+
this.deleteTempNode(selectedMembers);
|
|
128
|
+
|
|
125
129
|
// 批量删除.
|
|
126
130
|
let deleteMember = selectedMembers;
|
|
127
131
|
if (deleteMember.count() > 0) {
|
|
@@ -170,6 +174,31 @@ export default class CommandDeleteMember extends CommandComponent {
|
|
|
170
174
|
data.tip.value = 3 + "," + deleteMember.count();
|
|
171
175
|
}
|
|
172
176
|
|
|
177
|
+
//
|
|
178
|
+
private deleteTempNode(selectedMembers: Longan.List<MemberObject>) {
|
|
179
|
+
let tempNode = this.viewer.process.caeRenderObjectTreeManager.tempNode;
|
|
180
|
+
|
|
181
|
+
let ros = new Array<RenderObject>();
|
|
182
|
+
for (let i = 0; i < selectedMembers.count(); i++) {
|
|
183
|
+
let ro = selectedMembers.items[i];
|
|
184
|
+
for (let j = 0; j < tempNode.childObjects.length; j++) {
|
|
185
|
+
let child = tempNode.childObjects[j];
|
|
186
|
+
if (child.name === ro.name) {
|
|
187
|
+
ros.push(ro);
|
|
188
|
+
break;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
for(let i = 0; i < ros.length; i++) {
|
|
194
|
+
let ro = ros[i];
|
|
195
|
+
|
|
196
|
+
let iro =this.viewer.findInstanceObject(ro);
|
|
197
|
+
iro.visible = false;
|
|
198
|
+
this.process.removeRenderObject(ro);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
173
202
|
updatePanel() {
|
|
174
203
|
if (
|
|
175
204
|
this.viewer.selectionInterfaceManager.selectorFilter ===
|
|
@@ -152,7 +152,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
|
|
|
152
152
|
// let obj = process.findRenderObjectById(id);
|
|
153
153
|
let obj = process.findRenderObjectByNameInChildObject(process.caeRenderObjectTreeManager.jointNode, id);
|
|
154
154
|
|
|
155
|
-
if (obj && obj instanceof JointObject) {
|
|
155
|
+
if (obj && obj instanceof JointObject && obj.checkBusinessStateIsActive()) {
|
|
156
156
|
data.groupJoints.listOptions.list.push({
|
|
157
157
|
label: obj.name,
|
|
158
158
|
value: id,
|
|
@@ -166,7 +166,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
|
|
|
166
166
|
// let obj = process.findRenderObjectById(id);
|
|
167
167
|
let obj = process.findRenderObjectByNameInChildObject(process.caeRenderObjectTreeManager.memberNode, id);
|
|
168
168
|
|
|
169
|
-
if (obj && obj instanceof MemberObject) {
|
|
169
|
+
if (obj && obj instanceof MemberObject && obj.checkBusinessStateIsActive()) {
|
|
170
170
|
data.groupMembers.listOptions.list.push({
|
|
171
171
|
label: obj.name,
|
|
172
172
|
value: id,
|
|
@@ -180,7 +180,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
|
|
|
180
180
|
// let obj = process.findRenderObjectById(id);
|
|
181
181
|
let obj = process.findRenderObjectByNameInChildObject(process.caeRenderObjectTreeManager.plateNode, id);
|
|
182
182
|
|
|
183
|
-
if (obj && obj instanceof PlateObject) {
|
|
183
|
+
if (obj && obj instanceof PlateObject && obj.checkBusinessStateIsActive()) {
|
|
184
184
|
data.groupPlates.listOptions.list.push({
|
|
185
185
|
label: obj.name,
|
|
186
186
|
value: id,
|
|
@@ -193,7 +193,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
|
|
|
193
193
|
if (jointNode) {
|
|
194
194
|
for (let i = 0; i < jointNode.childObjects.length; i++) {
|
|
195
195
|
let item = jointNode.childObjects[i];
|
|
196
|
-
if (groupRO.refercenJointIds.indexOf(item.id) === -1) {
|
|
196
|
+
if (groupRO.refercenJointIds.indexOf(item.id) === -1 && (item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
197
197
|
data.allJoints.listOptions.list.push({
|
|
198
198
|
label: item.name,
|
|
199
199
|
value: item.name,
|
|
@@ -207,7 +207,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
|
|
|
207
207
|
if (memberNode) {
|
|
208
208
|
for (let i = 0; i < memberNode.childObjects.length; i++) {
|
|
209
209
|
let item = memberNode.childObjects[i];
|
|
210
|
-
if (groupRO.refercenMemberIds.indexOf(item.id) === -1) {
|
|
210
|
+
if (groupRO.refercenMemberIds.indexOf(item.id) === -1 && (item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
211
211
|
data.allMembers.listOptions.list.push({
|
|
212
212
|
label: item.name,
|
|
213
213
|
value: item.name,
|
|
@@ -221,7 +221,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
|
|
|
221
221
|
if (plateNode) {
|
|
222
222
|
for (let i = 0; i < plateNode.childObjects.length; i++) {
|
|
223
223
|
let item = plateNode.childObjects[i];
|
|
224
|
-
if (groupRO.refercenPlateIds.indexOf(item.id) === -1) {
|
|
224
|
+
if (groupRO.refercenPlateIds.indexOf(item.id) === -1 && (item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
225
225
|
data.allPlates.listOptions.list.push({
|
|
226
226
|
label: item.name,
|
|
227
227
|
value: item.name,
|
package/src/viewerWrapper/commands/pretreatment/colorDivideByGrupName/colorDivideByGrupNameConfig.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { Config } from "../../../../gsDevFx/propertyComponents/config";
|
|
|
2
2
|
import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent";
|
|
3
3
|
import { Process } from "../../../../gsDevFx/process";
|
|
4
4
|
import { ColorProperty } from "../../../../gsDevFx/propertyComponents/colorProperty";
|
|
5
|
+
import { DesignBaseObject } from "gs-ceec-design";
|
|
5
6
|
|
|
6
7
|
export default class ColorDivideByGrupNameConfig extends Config {
|
|
7
8
|
constructor() {
|
|
@@ -33,10 +34,12 @@ export default class ColorDivideByGrupNameConfig extends Config {
|
|
|
33
34
|
Process.activeProcess.findRenderObjectByName("杆件截面组");
|
|
34
35
|
if (grupObjectGroup) {
|
|
35
36
|
grupObjectGroup.childObjects.map((item) => {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
|
|
38
|
+
this.properties.items[0].data.grups.listOptions.list.push({
|
|
39
|
+
label: item.name,
|
|
40
|
+
value: "UnAssigned",
|
|
41
|
+
});
|
|
42
|
+
}
|
|
40
43
|
});
|
|
41
44
|
}
|
|
42
45
|
}
|
|
@@ -34,47 +34,49 @@ export default class ColorDivideByGrupThicknessConfig extends Config {
|
|
|
34
34
|
if (grupObjectGroup) {
|
|
35
35
|
grupObjectGroup.childObjects.map((item) => {
|
|
36
36
|
let child = item as GrupObject;
|
|
37
|
-
|
|
38
|
-
let
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
37
|
+
if (child.checkBusinessStateIsActive()) {
|
|
38
|
+
for (let i = 0; i < child.grupSegments.length; i++) {
|
|
39
|
+
let grupSeg = child.grupSegments[i];
|
|
40
|
+
if (!grupSeg.section) {
|
|
41
|
+
let thickness = grupSeg.tubWallThickness.toString();
|
|
42
|
+
let existed = false;
|
|
43
|
+
let list = property.data.thicknessArray.listOptions.list;
|
|
44
|
+
for (let j = 0; j < list.length; j++) {
|
|
45
|
+
if (thickness === list[j].label) {
|
|
46
|
+
existed = true;
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
47
49
|
}
|
|
48
|
-
}
|
|
49
50
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
51
|
+
if (!existed) {
|
|
52
|
+
list.push({
|
|
53
|
+
label: thickness,
|
|
54
|
+
value: "UnAssigned",
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
} else if (
|
|
58
|
+
grupSeg.section &&
|
|
59
|
+
grupSeg.section.crossSectionType === "TUB"
|
|
60
|
+
) {
|
|
61
|
+
let thickness = (
|
|
62
|
+
grupSeg.section as TubSectionObject
|
|
63
|
+
).outsideWallThick.toString();
|
|
64
|
+
let existed = false;
|
|
65
|
+
let list = property.data.thicknessArray.listOptions.list;
|
|
66
|
+
for (let j = 0; j < list.length; j++) {
|
|
67
|
+
if (thickness === list[j].label) {
|
|
68
|
+
existed = true;
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
69
71
|
}
|
|
70
|
-
}
|
|
71
72
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
if (!existed) {
|
|
74
|
+
//
|
|
75
|
+
list.push({
|
|
76
|
+
label: thickness,
|
|
77
|
+
value: "UnAssigned",
|
|
78
|
+
});
|
|
79
|
+
}
|
|
78
80
|
}
|
|
79
81
|
}
|
|
80
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cardObject.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardObject.ts"],"names":[],"mappings":"AAGA,qBAAa,UAAU;;IAGrB,IAAI,CAAC,IAAI,KAAA;IAiBT,OAAO;
|
|
1
|
+
{"version":3,"file":"cardObject.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardObject.ts"],"names":[],"mappings":"AAGA,qBAAa,UAAU;;IAGrB,IAAI,CAAC,IAAI,KAAA;IAiBT,OAAO;CA0FR"}
|
|
@@ -31,7 +31,7 @@ export declare class CommonInterfaceManager extends Longan.ViewerManagerBase {
|
|
|
31
31
|
currentSwitchColorDivide: SwitchColorDivide;
|
|
32
32
|
constructor(viewer: Viewer);
|
|
33
33
|
showPlotTitle(): string;
|
|
34
|
-
editPlotTitle(title: string):
|
|
34
|
+
editPlotTitle(title: string): 1 | 2;
|
|
35
35
|
private checTitlekNamelegal;
|
|
36
36
|
resetView(isSetViewMode?: boolean): void;
|
|
37
37
|
redraw(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelOptions.d.ts","sourceRoot":"","sources":["../../../../../../../src/gsDevFx/objects/caeObjects/optionObjects/modelOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,6DAA6D,CAAC;AAK1F,qBAAa,YAAa,SAAQ,gBAAgB;IAChD,QAAQ,SAAkB;IAE1B,QAAQ,EAAE,MAAM,CAAQ;IAExB,UAAU,EAAE,WAAW,CAAQ;;IAM/B,SAAS,IAAI,GAAG;IAehB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,kBAAkB;IAW5C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY;IAOjE,eAAe;
|
|
1
|
+
{"version":3,"file":"modelOptions.d.ts","sourceRoot":"","sources":["../../../../../../../src/gsDevFx/objects/caeObjects/optionObjects/modelOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,6DAA6D,CAAC;AAK1F,qBAAa,YAAa,SAAQ,gBAAgB;IAChD,QAAQ,SAAkB;IAE1B,QAAQ,EAAE,MAAM,CAAQ;IAExB,UAAU,EAAE,WAAW,CAAQ;;IAM/B,SAAS,IAAI,GAAG;IAehB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,kBAAkB;IAW5C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY;IAOjE,eAAe;CAYhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"corrzObject.d.ts","sourceRoot":"","sources":["../../../../../../../src/gsDevFx/objects/caeObjects/pretreatment/corrzObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAQpC,qBAAa,WAAY,SAAQ,gBAAgB;IAC/C,QAAQ,SAAiB;IAGzB,YAAY,EAAE,MAAM,CAAK;IAEzB,SAAS,EAAE,MAAM,CAAK;IAEtB,eAAe,EAAE,MAAM,CAAC;IAIxB,eAAe,EAAE,MAAM,CAAK;IAI5B,YAAY,EAAE,MAAM,CAAK;IAIzB,YAAY,EAAE,MAAM,CAAM;IAI1B,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"corrzObject.d.ts","sourceRoot":"","sources":["../../../../../../../src/gsDevFx/objects/caeObjects/pretreatment/corrzObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAQpC,qBAAa,WAAY,SAAQ,gBAAgB;IAC/C,QAAQ,SAAiB;IAGzB,YAAY,EAAE,MAAM,CAAK;IAEzB,SAAS,EAAE,MAAM,CAAK;IAEtB,eAAe,EAAE,MAAM,CAAC;IAIxB,eAAe,EAAE,MAAM,CAAK;IAI5B,YAAY,EAAE,MAAM,CAAK;IAIzB,YAAY,EAAE,MAAM,CAAM;IAI1B,YAAY,EAAE,MAAM,CAAM;IAI1B,oBAAoB,EAAE,MAAM,CAAM;IAIlC,gBAAgB,EAAE,MAAM,CAAM;IAI9B,aAAa,EAAE,MAAM,CAAM;IAIpB,KAAK,EAAE,MAAM,EAAE,CAAQ;;IAO9B,SAAS,IAAI,GAAG;IAwChB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,kBAAkB;IA0C5C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY;IAMjE,eAAe;CA4DhB"}
|