@flexem/fc-gui 3.0.0-alpha.16 → 3.0.0-alpha.160

package/modal/write-character/write-character-modal.component.less

@@ -1,49 +1,49 @@
-.modal-header {
-    padding: 10px;
-    border-color: transparent;
-}
-
-.modal-body {
-    position: relative;
-    padding: 0px 5px !important;
-}
-
-.modal-title {
-    display: unset;
-    margin-left: -6px;
-    font-size: 16px !important;
-}
-
-.form-control {
-    margin: 0 5%;
-    float: none;
-    width: 90%;
-}
-
-.modal-footer {
-    padding: 10px 4px 20px 5px !important;
-    text-align: right;
-    border-color: transparent;
-}
-
-.text-danger {
-    display: block;
-    color: #ed6b75;
-    font-size: 14px;
-    margin: 10px 0px 0px 15px;
-}
-
-.btn-primary {
-    background-color: #3B97FC;
-    border-color: #3B97FC;
-    padding: 5px 30px;
-    width: 90%;
-    margin: 0 5%;
-    height: 32px;
-}
-
-.write-character-value {
-    padding-left: 8px;
-    height: 32px;
-    margin-left: 16px;
-}
+.modal-header {
+    padding: 10px;
+    border-color: transparent;
+}
+
+.modal-body {
+    position: relative;
+    padding: 0px 5px !important;
+}
+
+.modal-title {
+    display: unset;
+    margin-left: -6px;
+    font-size: 16px !important;
+}
+
+.form-control {
+    margin: 0 5%;
+    float: none;
+    width: 90%;
+}
+
+.modal-footer {
+    padding: 10px 4px 20px 5px !important;
+    text-align: right;
+    border-color: transparent;
+}
+
+.text-danger {
+    display: block;
+    color: #ed6b75;
+    font-size: 14px;
+    margin: 10px 0px 0px 15px;
+}
+
+.btn-primary {
+    background-color: #3B97FC;
+    border-color: #3B97FC;
+    padding: 5px 30px;
+    width: 90%;
+    margin: 0 5%;
+    height: 32px;
+}
+
+.write-character-value {
+    padding-left: 8px;
+    height: 32px;
+    margin-left: 16px;
+}

package/modal/write-value/write-value-modal-args.d.ts

@@ -1,12 +1,16 @@
-import { NumericalOperation } from '../../model';
-export declare class WriteValueModalArgs {
-    variableName: string;
-    dataType: number;
-    fBoxDataType: number;
-    integerDigits: number;
-    fractionDigits: number;
-    numericalOperation: NumericalOperation;
-    version: number;
-    enableDataParsed: boolean;
-    constructor(variableName: string, dataType: number, fBoxDataType: number, integerDigits: number, fractionDigits: number, numericalOperation: NumericalOperation, version: number, enableDataParsed: boolean);
-}
+import { NumericalOperation } from '../../model';
+import { ReleasedVariableService } from '../../service';
+import { GuiContext } from '../../gui/gui-context';
+export declare class WriteValueModalArgs {
+    variableName: string;
+    dataType: number;
+    fBoxDataType: number;
+    integerDigits: number;
+    fractionDigits: number;
+    numericalOperation: NumericalOperation;
+    version: number;
+    enableDataParsed: boolean;
+    releasedVariableService: ReleasedVariableService;
+    guiContext?: GuiContext;
+    constructor(variableName: string, dataType: number, fBoxDataType: number, integerDigits: number, fractionDigits: number, numericalOperation: NumericalOperation, version: number, enableDataParsed: boolean, releasedVariableService: ReleasedVariableService, guiContext?: GuiContext);
+}

package/modal/write-value/write-value-modal-args.js

@@ -1,12 +1,14 @@
-export class WriteValueModalArgs {
-    constructor(variableName, dataType, fBoxDataType, integerDigits, fractionDigits, numericalOperation, version, enableDataParsed) {
-        this.variableName = variableName;
-        this.dataType = dataType;
-        this.fBoxDataType = fBoxDataType;
-        this.integerDigits = integerDigits;
-        this.fractionDigits = fractionDigits;
-        this.numericalOperation = numericalOperation;
-        this.version = version;
-        this.enableDataParsed = enableDataParsed;
-    }
-}
+export class WriteValueModalArgs {
+    constructor(variableName, dataType, fBoxDataType, integerDigits, fractionDigits, numericalOperation, version, enableDataParsed, releasedVariableService, guiContext) {
+        this.variableName = variableName;
+        this.dataType = dataType;
+        this.fBoxDataType = fBoxDataType;
+        this.integerDigits = integerDigits;
+        this.fractionDigits = fractionDigits;
+        this.numericalOperation = numericalOperation;
+        this.version = version;
+        this.enableDataParsed = enableDataParsed;
+        this.releasedVariableService = releasedVariableService;
+        this.guiContext = guiContext;
+    }
+}

package/modal/write-value/write-value-modal-args.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../model","name":"NumericalOperation","line":9,"character":35},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../model","name":"NumericalOperation","line":11,"character":35},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":14,"character":40},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":15,"character":28}]}]}}}}]

package/modal/write-value/write-value-modal.component.d.ts

@@ -1,54 +1,60 @@
-import { OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Localization } from '../../localization';
-import { NumericalOperation } from '../../model/numerical-display/numerical-operation';
-import { DataTypeService } from '../../utils/data-type/data-type.service';
-import { FractionDigitService } from '../../utils/fraction-digit.service';
-import { NumericalOperationService } from '../../utils/numerical-operation.service';
-import { WriteValueModalArgs } from './write-value-modal-args';
-import { WriteValueModelResult } from './write-value-model-result';
-export declare class WriteValueModalComponent implements OnInit {
-    localization: Localization;
-    private readonly dataTypeService;
-    private readonly fractionDigitService;
-    private readonly numericalOperationService;
-    private _onClosed;
-    get onClosed(): Observable<WriteValueModelResult>;
-    args: WriteValueModalArgs;
-    private dataType;
-    private fBoxDataType;
-    private pattern;
-    private fractionDigits;
-    private integerDigits;
-    private numericalLowerLimit;
-    private numericalUpperLimit;
-    private maxValueLimit;
-    private minValueLimit;
-    value: string;
-    valueType: string;
-    variableName: string;
-    enableNumericalOperation: boolean;
-    numericalOperation: NumericalOperation;
-    validationError: boolean;
-    validationErrorText: string;
-    writeMinValue: number;
-    writeMaxValue: number;
-    writeValueRangeText: string;
-    get invalidErrorText(): string;
-    constructor(localization: Localization, dataTypeService: DataTypeService, fractionDigitService: FractionDigitService, numericalOperationService: NumericalOperationService);
-    ngOnInit(): void;
-    initData(option: WriteValueModalArgs): void;
-    private setValueRangeAccordToDataParsed;
-    getWriteValueRangeText(): string;
-    save(): void;
-    close(modalResult?: WriteValueModelResult): void;
-    validate(): void;
-    private showValidationErrorInfo;
-    private hideValidationErrorInfo;
-    private getFractionDigits;
-    /**
-     * 格式化写入的值
-     * 因为有小数点的数值类型，会被按照小数点位数移位，所以需要在修改前右移小数点位数
-     */
-    private formatWriteValue;
-}
+import { OnInit } from '@angular/core';
+import { Localization } from '../../localization';
+import { NumericalOperation } from '../../model/numerical-display/numerical-operation';
+import { DataTypeService } from '../../utils/data-type/data-type.service';
+import { FractionDigitService } from '../../utils/fraction-digit.service';
+import { NumericalOperationService } from '../../utils/numerical-operation.service';
+import { WriteValueModalArgs } from './write-value-modal-args';
+import { BsModalRef } from 'ngx-bootstrap/modal';
+export declare class WriteValueModalComponent implements OnInit {
+    localization: Localization;
+    private readonly dataTypeService;
+    private readonly fractionDigitService;
+    private readonly numericalOperationService;
+    private readonly bsModalRef;
+    onClosed: any;
+    args: WriteValueModalArgs;
+    private dataType;
+    private fBoxDataType;
+    private pattern;
+    private fractionDigits;
+    private integerDigits;
+    private numericalLowerLimit;
+    private numericalUpperLimit;
+    private maxValueLimit;
+    private minValueLimit;
+    value: string;
+    valueType: string;
+    variableName: string;
+    displayVariableName: string;
+    enableNumericalOperation: boolean;
+    isNumericalOperation: boolean;
+    numericalOperation: NumericalOperation;
+    validationError: boolean;
+    validationErrorText: string;
+    writeMinValue: number;
+    writeMaxValue: number;
+    writeValueRangeText: string;
+    isSubmitting: boolean;
+    get invalidErrorText(): string;
+    constructor(localization: Localization, dataTypeService: DataTypeService, fractionDigitService: FractionDigitService, numericalOperationService: NumericalOperationService, bsModalRef: BsModalRef);
+    ngOnInit(): void;
+    initData(option: WriteValueModalArgs): void;
+    private setValueRangeAccordToDataParsed;
+    getWriteValueRangeText(): string;
+    save(): void;
+    /**
+     * 处理"当前语种ID"系统变量的保存
+     */
+    private handleCurrentLanguageIdSave;
+    close(): void;
+    validate(event?: any): void;
+    private showValidationErrorInfo;
+    private hideValidationErrorInfo;
+    private getFractionDigits;
+    /**
+     * 格式化写入的值
+     * 因为有小数点的数值类型，会被按照小数点位数移位，所以需要在修改前右移小数点位数
+     */
+    private formatWriteValue;
+}

package/modal/write-value/write-value-modal.component.html

@@ -1,21 +1,26 @@
-<form #writeValueForm="ngForm" novalidate (ngSubmit)="save()" bs-modal-drag>
-  <div class="modal-header">
-    <h4 class="modal-title">
-      <span>{{localization.setting}}</span>
-      <span>{{variableName}}</span>
-    </h4>
-    <button type="button" class="close pull-right" aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="modal-body">
-    <span class="write-value-range">{{localization.writeValueRange}}：&nbsp;{{writeValueRangeText}}
-      <span *ngIf="valueType">({{valueType}})</span>
-    </span>
-    <input type="text" name="valueInput" autoFocus class="form-control write-value" [(ngModel)]="value" (keyup)="validate()" autocomplete="off">
-    <span class="help-block text-danger" [hidden]="!validationError">{{validationErrorText}}</span>
-  </div>
-  <div class="modal-footer">
-    <button type="submit" class="btn md-skip btn-primary btn-block" [disabled]="validationError">{{localization.submit}}</button>
-  </div>
-</form>
+<form #writeValueForm="ngForm" novalidate (ngSubmit)="save()" bs-modal-drag>
+  <div class="modal-header">
+    <h4 class="modal-title">
+      <span>{{localization.setting}}</span>
+      <span>{{displayVariableName}}</span>
+    </h4>
+    <button type="button" class="close pull-right" aria-label="Close" (click)="close()">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <span class="write-value-range">{{localization.writeValueRange}}：</span>
+    <div class="write-value-range">
+      {{writeValueRangeText}}
+      <span *ngIf="valueType">({{valueType}})</span>
+    </div>
+    <input type="text" name="valueInput" autoFocus class="form-control write-value" [(ngModel)]="value" (keyup)="validate($event)" autocomplete="off">
+    <span class="help-block text-danger" [hidden]="!validationError">{{validationErrorText}}</span>
+  </div>
+  <div class="modal-footer">
+    <button type="submit" class="btn md-skip btn-primary btn-block" [disabled]="validationError || isSubmitting">
+      <ng-container *ngIf="!isSubmitting">{{localization.submit}}</ng-container>
+      <ng-container *ngIf="isSubmitting">{{localization.submitting}}</ng-container>
+    </button>
+  </div>
+</form>