@flexem/fc-gui 3.0.0-alpha.91 → 3.0.0-alpha.93

package/src/utils/data-type/fcloud-data-type.service.ts

@@ -1,205 +0,0 @@
-import { Injectable, Inject } from '@angular/core';
-import { LOCALIZATION, Localization } from '../../localization';
-import { FCloudDataType } from '../../model/shared/data-type/fcloud-data-Type';
-
-@Injectable()
-export class FCloudDataTypeService {
-
-    defaultIntegerDigits = 4;
-    defaultFractionDigits = 0;
-    dataTypeList = new Map<number, string>();
-
-    constructor(@Inject(LOCALIZATION) private localization: Localization) {
-        // 1, 'Int32'
-        // 2, 'Float'
-        // 4, 'Bool'
-        // 8, 'String'
-        // 90, 'Binary'
-        // 99, 'Hex'
-    }
-
-    getValueType(id: number): string {
-        switch (id) {
-            case FCloudDataType.Binary:
-                return this.localization.binaryType;
-            case FCloudDataType.Int32:
-            case FCloudDataType.Float:
-                return this.localization.decimalType;
-            case FCloudDataType.Hex:
-                return this.localization.hexadecimalType;
-            case FCloudDataType.String:
-                return this.localization.stringType;
-        }
-    }
-
-    getValuePattern(id: number) {
-        switch (id) {
-            case FCloudDataType.Binary:
-                return '^[01]+$';
-            case FCloudDataType.Int32:
-            case FCloudDataType.Float:
-                return '^[+-]?[0-9]*(\\.[0-9]*)?$';
-            case FCloudDataType.Hex:
-                return '^[0-9a-fA-F]+$';
-        }
-    }
-
-    isHexType(id: number): boolean {
-        return id === FCloudDataType.Hex;
-    }
-
-    isBinaryType(id: number): boolean {
-        return id === FCloudDataType.Binary;
-    }
-
-    isHexOrBinaryType(id: number): boolean {
-        return id === FCloudDataType.Binary || id === FCloudDataType.Hex;
-    }
-
-    isFloat(id: number): boolean {
-        return id === FCloudDataType.Float;
-    }
-
-    /**
-     * 获取数据型号最大长度
-     * @param id
-     */
-    getValueMaxLength(id: number): number {
-        switch (id) {
-            case FCloudDataType.Int32: // Int32
-                return 10;
-            case FCloudDataType.Float:
-                return 11;
-            case FCloudDataType.Binary: // Binary
-                return 32;
-            case FCloudDataType.Hex: // Hex
-                return 8;
-            default:
-                return 0;
-        }
-    }
-
-    /**
-     * 是否支持小数位
-     * @param id
-     */
-    isSupportFractionDigit(id: number): boolean {
-        return id !== FCloudDataType.Bool && id !== FCloudDataType.String && id !== FCloudDataType.Binary && id !== FCloudDataType.Hex;
-    }
-
-    /**
-    * 是否为有符号数
-    * @param id
-    */
-    isSignedType(id: number): boolean {
-        return id === FCloudDataType.Int32 || id === FCloudDataType.Float;
-    }
-
-    /**
-     * 是否支持数值运算
-     * @param id
-     */
-    isSupportNumericalOperation(id: number): boolean {
-        return id !== FCloudDataType.Bool && id !== FCloudDataType.Binary && id !== FCloudDataType.Hex && id !== FCloudDataType.String;
-    }
-
-    /**
-    * 数据转换成10进制
-    * @param value
-    * @param id
-    */
-    formatToDecimal(value: any, id: number) {
-        if (this.isBinaryType(id)) {
-            return parseInt(value, 2);
-        }
-        if (this.isHexType(id)) {
-            return parseInt(value, 16);
-        }
-        return value;
-    }
-
-    /**
-       * 获取数据型号最小值
-       * @param id
-       * @param? integerDigits
-       * @param? fractionDigits
-       */
-    getMinValue(id: number, integerDigits?: number, fractionDigits?: number): number {
-        let minValue;
-        switch (id) {
-            case FCloudDataType.Binary:
-            case FCloudDataType.Hex:
-                minValue = 0;
-                break;
-            case FCloudDataType.Int32:
-                minValue = -2147483648;
-                break;
-            case FCloudDataType.Float:
-                minValue = -1000000000;
-                break;
-        }
-        if (integerDigits) {
-            let digitsLength = integerDigits;
-            if (fractionDigits) {
-                digitsLength = digitsLength + fractionDigits;
-            }
-
-            if (digitsLength) {
-                if (minValue.toString().length - 1 > digitsLength) {
-                    minValue = -this.getFillNine(digitsLength);
-                }
-            }
-            if (this.isFloat(id) && fractionDigits) {
-                minValue = minValue / Math.pow(10, fractionDigits);
-            }
-        }
-
-        return minValue;
-    }
-
-    /**
-       * 获取数据型号最大值
-       * @param id
-       * @param? integerDigits
-       * @param? fractionDigits
-       */
-    getMaxValue(id: number, integerDigits?: number, fractionDigits?: number): number {
-        let maxValue;
-        switch (id) {
-            case FCloudDataType.Binary:
-            case FCloudDataType.Hex:
-                maxValue = 4294967295;
-                break;
-            case FCloudDataType.Int32:
-                maxValue = 2147483647;
-                break;
-            case FCloudDataType.Float:
-                maxValue = 1000000000;
-                break;
-        }
-        if (integerDigits) {
-            let digitsLength = integerDigits;
-            if (fractionDigits) {
-                digitsLength = digitsLength + fractionDigits;
-            }
-            if (digitsLength) {
-                if (maxValue.toString().length > digitsLength) {
-                    maxValue = this.getFillNine(digitsLength);
-                }
-            }
-            if (this.isFloat(id) && fractionDigits) {
-                maxValue = maxValue / Math.pow(10, fractionDigits);
-            }
-        }
-
-        return maxValue;
-    }
-
-    getFillNine(num: number) {
-        let text = '9';
-        for (let i = 1; i < num; i++) {
-            text = `9${text}`;
-        }
-        return text;
-    }
-}

package/src/utils/fraction-digit.service.ts

@@ -1,132 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable()
-export class FractionDigitService {
-
-    private readonly zeroText = '0';
-
-    /**
-     * 左补齐字符串
-     * number  要处理的数字
-     * fillLength 要补齐的长度
-     * char 要补齐的字符
-     */
-    private padLeft(number: any, fillLength: any, char: any): string {
-        let result = String(number);
-        char = char ? char : this.zeroText; // 默认补0
-
-        let currentLength = result.length;
-        while (currentLength < fillLength) {
-            result = char + result;
-            currentLength++;
-        }
-        return result.toString();
-    }
-
-    /**
-     * 右补齐字符串
-     * @param number  要处理的数字
-     * @param fillLength 要补齐的长度
-     * @param char  要补齐的字符
-     */
-    private padRight(number: any, fillLength: any, char: any): string {
-        let result = String(number);
-        char = char ? char : this.zeroText; // 默认补0
-
-        let currentLength = result.length;
-        while (currentLength < fillLength) {
-            result = result + char;
-            currentLength++;
-        }
-        return result.toString();
-    }
-
-    /**
-     * 左移小数点位置（用于数学计算，相当于除以Math.pow(10,scale)）
-     * @param fractionDigits 要移位的刻度
-     * @return
-     */
-    private movePointLeft(number: any, fractionDigits: any): string {
-        if (fractionDigits <= 0) { return number; }
-        const numberText = String(number);
-        const decimalParts = numberText.split('.');
-        let intergerPart = decimalParts[0] ? decimalParts[0] : '';
-        const fractionPart = decimalParts[1] ? decimalParts[1] : '';
-
-        let fractionPointText = '.';
-        let minusText = '';
-
-        if (intergerPart.slice(0, 1) === '-') {
-            intergerPart = intergerPart.slice(1);
-            minusText = '-';
-        }
-        if (intergerPart.length <= fractionDigits) {
-            fractionPointText = '0.';
-            intergerPart = this.padLeft(intergerPart, fractionDigits, '0');
-        }
-        return minusText +
-            intergerPart.slice(0, -fractionDigits) +
-            fractionPointText +
-            intergerPart.slice(-fractionDigits) +
-            fractionPart;
-    }
-
-    /**
-     * 右移小数点位置（用于数学计算，相当于乘以Math.pow(10,scale)）
-     * @param number  要处理的数字
-     * @param fractionDigits 要移位的刻度
-     */
-    private movePointRight(number: any, fractionDigits: any): string {
-        if (fractionDigits <= 0) { return number; }
-
-        // eslint-disable-next-line no-new-wrappers
-        const numberText = new String(number);
-        const decimalParts = numberText.split('.');
-        const intergerPart = decimalParts[0] ? decimalParts[0] : '';
-        let fractionPart = decimalParts[1] ? decimalParts[1] : '';
-
-        let fractionPointText = '.';
-
-        if (fractionPart.length <= fractionDigits) {
-            fractionPointText = '';
-            fractionPart = this.padRight(fractionPart, fractionDigits, '0');
-        }
-        return intergerPart +
-            fractionPart.slice(0, fractionDigits) +
-            fractionPointText +
-            fractionPart.slice(fractionDigits, fractionPart.length);
-    }
-
-    /**
-     * 移动小数点位置（用于数学计算，相当于（乘以/除以）Math.pow(10,scale)）
-     * @param number  要处理的数字
-     * @param fractionDigits  要移位的刻度（正数表示向右移；负数表示向左移动；0返回原值）
-     */
-    movePoint(number: any, fractionDigits: any): string {
-        return fractionDigits >= 0
-            ? this.movePointRight(number, fractionDigits)
-            : this.movePointLeft(number, -fractionDigits);
-    }
-
-    /**
-     * 按照指定的小数位，对数字进行四舍五入计算
-     * @param number 要处理的数字
-     * @param fractionDigits 指定的小数位
-     */
-    roundingToFixedFractionDigits(number: any, fractionDigits: number): string {
-        const numberText = String(number);
-        const fractionPointIndex = numberText.indexOf('.') + 1;
-        const currentFractionDigits = numberText.length - fractionPointIndex;
-        if (fractionPointIndex >= 1 && currentFractionDigits > fractionDigits) {
-            let result = +this.movePoint(numberText, fractionDigits);
-            const roundingNumber = Number(numberText.substr(fractionPointIndex + fractionDigits, 1));
-            if (roundingNumber >= 5 && number >= 0 || roundingNumber < 5 && number < 0) {
-                result = Math.ceil(result);
-            } else {
-                result = Math.floor(result);
-            }
-            return this.movePoint(result, -fractionDigits);
-        }
-        return Number(number).toFixed(fractionDigits);
-    }
-}

package/src/utils/graph-util.ts

@@ -1,19 +0,0 @@
-import { GraphSetting } from '../model';
-import { GraphExtendedStyle } from '../shared';
-
-export class GraphUtil {
-    static getExtendedStyle(graphSetting: GraphSetting, stateIndex: number): GraphExtendedStyle | undefined {
-        if (stateIndex < 0) { throw new Error('stateIndex can not less than zero.'); }
-        let result: GraphExtendedStyle;
-        if (graphSetting.styles != null) {
-            result = graphSetting.styles.find(style => {
-                if (style.version == null) {
-                    return style.state != null && +style.state === stateIndex;
-                } {
-                    return style.stateIndex === stateIndex;
-                }
-            });
-        }
-        return result;
-    }
-}

package/src/utils/guid.ts

@@ -1,29 +0,0 @@
-export class Guid {
-
-    static newGuid(): Guid {
-        let result: string;
-        let i: string;
-        let j: number;
-
-        result = '';
-        for (j = 0; j < 32; j++) {
-            if (j === 8 || j === 12 || j === 16 || j === 20) {
-                result = result + '-';
-            }
-            i = Math.floor(Math.random() * 16).toString(16).toUpperCase();
-            result = result + i;
-        }
-        return new Guid(result);
-    }
-
-    constructor(public readonly guid: string) {
-    }
-
-    public toString(format?: string): string {
-        if (format && 'n' === format.toLowerCase()) {
-            return this.guid.replace(/-/g, '');
-        } else {
-            return this.guid;
-        }
-    }
-}

package/src/utils/index.ts

@@ -1,8 +0,0 @@
-
-export { AccessPermissionService } from './access-permission.service';
-export { GraphUtil } from './graph-util';
-export { FBoxDataTypeService } from './data-type/fbox-data-type.service';
-export { FCloudDataTypeService } from './data-type/fcloud-data-type.service';
-export { DataTypeService } from './data-type/data-type.service';
-export { FractionDigitService } from './fraction-digit.service';
-export { NumericalOperationService } from './numerical-operation.service';

package/src/utils/numerical-operation-type.ts

@@ -1,4 +0,0 @@
-export enum NumericalOperationType {
-    ProportionalConversion = 2,
-    Zoom = 4
-}

package/src/utils/numerical-operation.service.ts

@@ -1,167 +0,0 @@
-import { Injectable } from '@angular/core';
-
-import { NumericalOperationType } from './numerical-operation-type';
-import { NumericalOperation } from '../model/numerical-display/numerical-operation';
-import { DataTypeService } from './data-type/data-type.service';
-import { NumericalDisplay } from '../model';
-
-@Injectable()
-export class NumericalOperationService {
-
-    constructor(private readonly dataTypeService: DataTypeService) {
-    }
-
-    getNumericalOperationedValue(model: any, value: any, fractionDigits: number) {
-        let operationedValue = value;
-        const numericalOperationSetting = model.numericalOperationSetting;
-        // 比例转换
-        // 显示值= (比例上限-比例下限) / (数值上限-数值下限) * (PLC值-数值下限) + 比例下限
-        if (numericalOperationSetting.type === NumericalOperationType.ProportionalConversion) {
-            const proportionalUpperLimit = numericalOperationSetting.settings.upperLimit;
-            const proportionalLowerLimit = numericalOperationSetting.settings.lowerLimit;
-            const numericalUpperLimit = model.numericalUpperLimit;
-            const numericalLowerLimit = model.numericalLowerLimit;
-            if (numericalUpperLimit === numericalLowerLimit) {
-                return operationedValue;
-            }
-            const displayValue = (proportionalUpperLimit - proportionalLowerLimit)
-                / (numericalUpperLimit - numericalLowerLimit) * (value - numericalLowerLimit)
-                + proportionalLowerLimit;
-            operationedValue = displayValue.toFixed(fractionDigits);
-        } else if (numericalOperationSetting.type === NumericalOperationType.Zoom) {
-            // 显示值= (PLC值*增益) +偏移量
-            const gain = numericalOperationSetting.settings.gain;
-            const offset = numericalOperationSetting.settings.offset;
-            const displayValue = value * gain + offset;
-            operationedValue = displayValue.toFixed(fractionDigits);
-        }
-        return operationedValue;
-    }
-
-    getNumericalOperations(model: NumericalDisplay): NumericalOperation {
-        const numericalOperation: any = {};
-        numericalOperation.numericalUpperLimit = (model.numericalUpperLimit || model.numericalUpperLimit === 0) ? +model.numericalUpperLimit
-            : this.dataTypeService.getMaxValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
-        numericalOperation.numericalLowerLimit = (model.numericalLowerLimit || model.numericalLowerLimit === 0) ? +model.numericalLowerLimit
-            : this.dataTypeService.getMinValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
-        numericalOperation.enableNumericalOperation = model.enableNumericalOperation;
-        if (model.enableNumericalOperation) {
-            numericalOperation.type = model.numericalOperationSetting.type;
-            if (numericalOperation.type === NumericalOperationType.ProportionalConversion) {
-                numericalOperation.proportionalConversion = {};
-                numericalOperation.proportionalConversion.lowerLimit = model.numericalOperationSetting.settings.lowerLimit;
-                numericalOperation.proportionalConversion.upperLimit = model.numericalOperationSetting.settings.upperLimit;
-            } else if (numericalOperation.type === NumericalOperationType.Zoom) {
-                numericalOperation.zoom = {};
-                numericalOperation.zoom.gain = model.numericalOperationSetting.settings.gain;
-                numericalOperation.zoom.offset = model.numericalOperationSetting.settings.offset;
-            }
-        }
-        return numericalOperation;
-    }
-
-    getWriteValue(version: number, value: string, option: NumericalOperation, dataType: number, fractionDigits: number): string {
-        const displayValue = Number(value);
-        let writeValue = Number(value);
-        // 比例转换
-        // PLC值 = （显示值 - 比例下限）*(数值上限-数值下限) /(比例上限-比例下限) + 数值下限
-        if (option.type === NumericalOperationType.ProportionalConversion) {
-            const proportionalUpperLimit = option.proportionalConversion.upperLimit;
-            const proportionalLowerLimit = option.proportionalConversion.lowerLimit;
-            const numericalUpperLimit = option.numericalUpperLimit;
-            const numericalLowerLimit = option.numericalLowerLimit;
-            if (proportionalUpperLimit === proportionalLowerLimit) {
-                return writeValue.toString();
-            }
-            writeValue = (displayValue - proportionalLowerLimit) * (numericalUpperLimit - numericalLowerLimit)
-                / (proportionalUpperLimit - proportionalLowerLimit)
-                + numericalLowerLimit;
-        } else if (option.type === NumericalOperationType.Zoom) {
-            // PLC值 = （显示值-偏移量）/增益
-            const gain = option.zoom.gain;
-            const offset = option.zoom.offset;
-            if (gain === 0) {
-                return writeValue.toString();
-            }
-            writeValue = (displayValue - offset) / gain;
-        }
-        if (this.dataTypeService.isFloat(version, dataType)) {
-            writeValue = Number(writeValue.toFixed(fractionDigits));
-        } else {
-            writeValue = Number(writeValue.toFixed(0));
-        }
-        return writeValue.toString();
-    }
-
-    getWriteMaxValue(numericalUpperLimit: number, option: NumericalOperation): number {
-        // 校验数值范围
-        let maxValueLimit = numericalUpperLimit;
-        if (option.enableNumericalOperation) {
-            if (option.type === NumericalOperationType.ProportionalConversion) {
-                maxValueLimit = option.proportionalConversion.upperLimit;
-            } else if (option.type === NumericalOperationType.Zoom) {
-                // 显示值= (PLC值*增益) +偏移量
-                const gain = option.zoom.gain;
-                const offset = option.zoom.offset;
-                const perationGain = this.toInteger(gain);
-                maxValueLimit = maxValueLimit * perationGain.num / perationGain.times + offset;
-            }
-        }
-        return maxValueLimit;
-    }
-
-    getWriteMinValue(numericalLowerLimit: number, option: NumericalOperation): number {
-        // 校验数值范围
-        let minValueLimit = numericalLowerLimit;
-        if (option.enableNumericalOperation) {
-            if (option.type === NumericalOperationType.ProportionalConversion) {
-                minValueLimit = option.proportionalConversion.lowerLimit;
-            } else if (option.type === NumericalOperationType.Zoom) {
-                // 显示值= (PLC值*增益) +偏移量
-                const gain = option.zoom.gain;
-                const offset = option.zoom.offset;
-                const perationGain = this.toInteger(gain);
-                minValueLimit = minValueLimit * perationGain.num / perationGain.times + offset;
-            }
-        }
-        return minValueLimit;
-    }
-
-    /*
-    * 将一个浮点数转成整数，返回整数和倍数。如 3.14 >> 314，倍数是 100
-    * @param floatNum {number} 小数
-    * @return {object}
-    *   {times:100, num: 314}
-    */
-    toInteger(floatNum: number) {
-        const ret = { times: 1, num: 0 };
-        const isNegative = floatNum < 0 ? true : false;
-        floatNum = Math.abs(floatNum);
-        if (this.isInteger(floatNum)) {
-            ret.num = floatNum;
-            if (isNegative) {
-                ret.num = -floatNum;
-            } else {
-                ret.num = floatNum;
-            }
-            return ret;
-        }
-        const strfi = floatNum + '';
-        const dotPos = strfi.indexOf('.');
-        const len = strfi.substr(dotPos + 1).length;
-        const times = Math.pow(10, len);
-        const intNum = parseInt((floatNum * times + 0.5).toString(), 10);
-        ret.times = times;
-        ret.num = intNum;
-        if (isNegative) {
-            ret.num = -intNum;
-        } else {
-            ret.num = intNum;
-        }
-        return ret;
-    }
-
-    isInteger(obj) {
-        return Math.floor(obj) === obj;
-    }
-}

package/src/utils/variable-util.ts

@@ -1,13 +0,0 @@
-import { VariableDefinition } from '../communication/variable/variable-definition';
-import { VariableStore, GetVariableNameArgs } from '../config';
-
-export class VariableUtil {
-
-    static getConvertedVariableName(variableStore: VariableStore, variable: VariableDefinition): string {
-        if (variable.variableVersion) {
-            return variable.name;
-        } else {
-            return variableStore.getVariableName(new GetVariableNameArgs(variable.name, variable.groupName, variable.dataSourceCode));
-        }
-    }
-}

package/src/view/popup-view.service.ts

@@ -1,11 +0,0 @@
-import { Observable } from 'rxjs';
-import { ElementRef } from '@angular/core';
-
-export interface PopupViewService {
-
-    popView(viewIndex: number, hostContainerId: string, el: ElementRef): Observable<void>;
-
-    closeView();
-
-    moveView(movementX: number, movementY: number);
-}

package/src/view/view.service.ts

@@ -1,13 +0,0 @@
-import { Injectable, ElementRef } from '@angular/core';
-import { Observable } from 'rxjs';
-
-@Injectable()
-export class ViewService {
-
-    //  因为每一个组件都会有切换页面,在此进行缓存.每一个调用自己的toggleView方法,避免冲突,
-    //  Key为组件ElementRef实例,Value为其调用的方法.每一个组件都缓存自己的切换方法
-    toggleViews: Map<ElementRef, (viewIndex: number, hostContainerId: string, el: ElementRef) => Observable<void>>;
-    constructor() {
-        this.toggleViews = new Map<ElementRef, (viewIndex: number, hostContainerId: string, el: ElementRef) => Observable<void>>();
-    }
-}