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

package/demo/src/polyfills.ts

@@ -0,0 +1,68 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/** IE10 and IE11 requires the following to support `@angular/animation`. */
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+
+/** Evergreen browsers require these. **/
+// import 'core-js/es6/reflect';
+// import 'core-js/es7/reflect';
+
+
+/** ALL Firefox browsers require the following to support `@angular/animation`. **/
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+
+
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl';  // Run `npm install --save intl`.

package/demo/src/styles.css

@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */

package/demo/src/tsconfig.app.json

@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "declaration": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "noEmitHelpers" :false,
+    "lib": ["es6", "dom"],
+    "types": [
+      "jasmine",
+      "webpack"
+    ],
+    "mapRoot": "./",
+    "module": "es6",
+    "moduleResolution": "node",
+    "outDir": "../temp/out-tsc",
+    "sourceMap": true,
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ],
+    "skipLibCheck": true,
+	"allowSyntheticDefaultImports": true
+  },
+  "files": [
+    "polyfills.ts",
+    "main.ts",
+    "environments/environment.prod.ts"
+  ]
+}

package/demo/src/tsconfig.spec.json

@@ -0,0 +1,21 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "module": "commonjs",
+    "target": "es5",
+    "baseUrl": "",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

package/demo/src/typings.d.ts

@@ -0,0 +1,5 @@
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+    id: string;
+}

package/e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { GuiPage } from './app.po';
+
+describe('gui App', () => {
+    let page: GuiPage;
+
+    beforeEach(() => {
+        page = new GuiPage();
+    });
+
+    it('should display message saying app works', () => {
+        page.navigateTo();
+        expect(page.getParagraphText()).toEqual('app works!');
+    });
+});

package/e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, element, by } from 'protractor';
+
+export class GuiPage {
+    navigateTo() {
+        return browser.get('/');
+    }
+
+    getParagraphText() {
+        return element(by.css('app-root h1')).getText();
+    }
+}

package/e2e/tsconfig.e2e.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types":[
+      "jasmine",
+      "node"
+    ]
+  }
+}

package/karma.conf.js

@@ -0,0 +1,42 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client:{
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    files: [
+      
+    ],
+    preprocessors: {
+      
+    },
+    mime: {
+      'text/x-typescript': ['ts','tsx']
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
+      fixWebpackSourcePaths: true
+    },
+    
+    reporters: config.angularCli && config.angularCli.codeCoverage
+              ? ['progress', 'coverage-istanbul']
+              : ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false
+  });
+};

package/package.json

@@ -1,23 +1,98 @@
-{
-	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.90",
-	"module": "public_api.js",
-	"typings": "public_api.d.ts",
-	"license": "UNLICENSED",
-	"name": "@flexem/fc-gui",
-	"peerDependencies": {
-		"@angular/common": "~9.1.9",
-		"@angular/core": "~9.1.9",
-		"d3-drag": "^1.2.1",
-		"d3-selection": "^1.3.0",
-		"jquery": "^3.2.1",
-		"jqueryui": "^1.11.1",
-		"lodash": "^4.17.4",
-		"moment": "^2.21.0",
-		"ngx-bootstrap": "5.5.0",
-		"rxjs": "~6.5.4",
-		"snapsvg": "^0.5.1",
-		"zone.js": "~0.9.1"
-	},
-	"_id": "@flexem/fc-gui@"
-}
+{
+  "name": "@flexem/fc-gui",
+  "version": "3.0.0-alpha.91",
+  "scripts": {
+    "ng": "ng",
+    "demo.build": "ng build -prod --aot",
+    "link": "ngm link -p src --here",
+    "build": "npm run lint && ngm build -p src --clean --main public_api.ts && npm run copy",
+    "build.watch": "npm run copy && ngm build -p src --watch --skip-bundles",
+    "start": "ng serve --host 0.0.0.0 --port 41300 --aot",
+    "copy": "cpx \"src/assets/img/*.svg\" \"dist/assets/img\"",
+    "lint": "eslint \"src/**/*.ts\"",
+    "test": "karma start ./src/karma.conf.js"
+  },
+
+  "main": "bundles/fc-gui.umd.js",
+  "module": "public_api.js",
+  "typings": "public_api.d.ts",
+  "eslintConfig": {
+    "env": {
+      "browser": true,
+      "node": true
+    }
+  },
+  "dependencies": {
+    "@angular-devkit/build-angular": "~0.901.6",
+    "@angular/animations": "~9.1.9",
+    "@angular/common": "~9.1.9",
+    "@angular/compiler": "~9.1.9",
+    "@angular/core": "~9.1.9",
+    "@angular/forms": "~9.1.9",
+    "@angular/platform-browser": "~9.1.9",
+    "@angular/platform-browser-dynamic": "~9.1.9",
+    "@angular/router": "~9.1.9",
+    "@types/d3-drag": "^1.2.1",
+    "bootstrap": "^4.0.0",
+    "cpx": "^1.5.0",
+    "d3": "3.5.12",
+    "d3-drag": "^1.2.1",
+    "d3-path": "^1.0.5",
+    "d3-selection": "^1.3.0",
+    "jquery": "^3.2.1",
+    "jqueryui": "^1.11.1",
+    "lodash": "^4.17.4",
+    "moment": "^2.21.0",
+    "ngx-bootstrap": "5.6.1",
+    "nvd3": "file:../../../angular/external_libs/nvd3",
+    "rxjs": "~6.5.4",
+    "snapsvg": "^0.5.1",
+    "tslint-to-eslint-config": "^0.5.1",
+    "zone.js": "~0.9.1"
+  },
+  "peerDependencies": {
+    "d3-path": "^1.0.5",
+    "d3-selection": "^1.3.0",
+    "jquery": "^3.2.1",
+    "jqueryui": "^1.11.1",
+    "lodash": "^4.17.4",
+    "ngx-bootstrap": "5.5.0"
+  },
+  "devDependencies": {
+    "@angular/cli": "~9.1.6",
+    "@angular/compiler-cli": "~9.1.9",
+    "@types/d3-path": "^1.0.7",
+    "@types/d3-selection": "^1.1.0",
+    "@types/jasmine": "~2.8.3",
+    "@types/jquery": "^2.0.42",
+    "@types/jqueryui": "^1.11.32",
+    "@types/lodash": "^4.14.63",
+    "@types/node": "~6.0.60",
+    "@types/webpack": "^2.2.15",
+    "@typescript-eslint/eslint-plugin": "~2.23.0",
+    "@typescript-eslint/eslint-plugin-tslint": "~2.23.0",
+    "@typescript-eslint/parser": "~2.23.0",
+    "awesome-typescript-loader": "^3.5.0",
+    "codelyzer": "^5.1.2",
+    "del-cli": "^1.1.0",
+    "eslint": "^6.8.0",
+    "jasmine-core": "~3.5.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~5.0.0",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "~2.1.0",
+    "karma-jasmine": "~3.0.1",
+    "karma-jasmine-html-reporter": "^1.4.2",
+    "lite-server": "2.2.2",
+    "ngm-cli": "1.0.4",
+    "npm-run-all": "^4.0.1",
+    "protractor": "~5.1.0",
+    "ts-node": "~2.0.0",
+    "tslint": "5.20.1",
+    "typescript": "~3.8.3"
+  },
+  "license": "UNLICENSED",
+  "workspaces": [
+    "./dist"
+  ]
+}

package/protractor.conf.js

@@ -0,0 +1,30 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './e2e/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  beforeLaunch: function() {
+    require('ts-node').register({
+      project: 'e2e/tsconfig.e2e.json'
+    });
+  },
+  onPrepare() {
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  }
+};

package/src/communication/variable/variable-communicator.ts

@@ -0,0 +1,22 @@
+import { Observable } from 'rxjs';
+import { VariableValue } from './variable-value';
+import { VariableState } from './variable-state';
+
+export interface VariableCommunicator {
+
+    openVariable(variableName: string,  appId: string): Observable<VariableValue>;
+
+    openVariables(variableNames: Array<string>, appId: string): Observable<Array<VariableValue>>;
+
+    write(variableName: string, value: any): Observable<VariableValue>;
+
+    writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
+
+    subscribeVariableState(variableName: string): Observable<VariableState>;
+
+    subscribeVariableStates(variableNames: Array<string>): Observable<Array<VariableState>>;
+
+    subscribeUserDeviceAlarms(appId: string);
+
+    dispose();
+}

package/src/communication/variable/variable-definition.ts

@@ -0,0 +1,10 @@
+/**
+ * 变量定义:标识变量的信息（变量名+变量分组名+数据源编号）
+ */
+export class VariableDefinition {
+    constructor(public readonly name: string, public readonly groupName?: string, public readonly dataSourceCode?: number, public readonly variableVersion?: number) {
+        this.groupName = groupName ? groupName : undefined;
+        this.dataSourceCode = dataSourceCode ? dataSourceCode : 0;
+        this.variableVersion = variableVersion ? variableVersion : undefined;
+    }
+}

package/src/communication/variable/variable-state-enum.ts

@@ -0,0 +1,7 @@
+export enum VariableStateEnum {
+    Normal = 0, // 在线
+    Offline = 1, // 离线
+    Unbind = 3, // 未绑定
+    DataNormal = 9, // 数据通信正常
+    Abnormal = 99, // 数据异常
+}

package/src/communication/variable/variable-state.ts

@@ -0,0 +1,5 @@
+import { VariableStateEnum } from './variable-state-enum';
+
+export class VariableState {
+    constructor(public readonly variableName: string, public state: VariableStateEnum) { }
+}

package/src/communication/variable/variable-value.ts

@@ -0,0 +1,5 @@
+import { VariableStateEnum } from './variable-state-enum';
+
+export class VariableValue {
+    constructor(public readonly variableName: string, public state: VariableStateEnum, public value?: any, public readonly timeStamp?: string) { }
+}

package/src/config/alarm/alarm.store.ts

@@ -0,0 +1,9 @@
+import { Observable } from 'rxjs';
+import { GetAlarmsArgs } from './get-alarms-args';
+
+export interface AlarmsStore {
+
+    getHistoryAlarms(input: GetAlarmsArgs): Observable<any>;
+
+    getCurrentAlarms(input: GetAlarmsArgs): Observable<any>;
+}

package/src/config/alarm/get-alarms-args.ts

@@ -0,0 +1,11 @@
+import * as moment from 'moment';
+
+export class GetAlarmsArgs {
+    constructor(
+        readonly alarmNames: string[],
+        readonly triggeredStartTime: moment.Moment,
+        readonly triggeredEndTime: moment.Moment,
+        readonly maxResultCount: number,
+        readonly skipCount: number) {
+    }
+}

package/src/config/config-store.ts

@@ -0,0 +1,24 @@
+import { GraphStore } from './graph/graph-store';
+import { ViewStore } from './view/view-store';
+import { ImageStore } from './image/image-store';
+import { HistoryDataStore } from './history-data/history-data.store';
+import { VariableStore } from './variable/variable-store';
+import { AlarmsStore } from './alarm';
+
+/**
+ * 配置仓储
+ */
+export interface ConfigStore {
+
+    readonly viewStore: ViewStore;
+
+    readonly graphStore: GraphStore;
+
+    readonly imageStore: ImageStore;
+
+    readonly historyDataStore: HistoryDataStore;
+
+    readonly alarmsStore: AlarmsStore;
+
+    readonly variableStore: VariableStore;
+}

package/src/config/graph/graph-result.ts

@@ -0,0 +1,16 @@
+import { Graph } from './graph';
+
+export class GraphResult {
+    private static failedResult = new GraphResult(null, true);
+
+    static failed(): GraphResult {
+        return GraphResult.failedResult;
+    }
+
+    static success(graph: Graph): GraphResult {
+        return new GraphResult(graph);
+    }
+
+    constructor(public readonly graph?: Graph, public readonly failed?: boolean) {
+    }
+}

package/src/config/graph/graph-store.ts

@@ -0,0 +1,12 @@
+import { Observable } from 'rxjs';
+import { GraphResult } from './graph-result';
+import { GraphExtendedStyle } from '../../shared/graph-extended-style';
+
+export interface GraphStore {
+
+    /**
+     * Get state's graph info by graph id and state id.
+     */
+    getGraph(graphId: string | number, stateId: number, extendedStyle?: GraphExtendedStyle): Observable<GraphResult>;
+
+}

package/src/config/graph/graph-type.ts

@@ -0,0 +1,4 @@
+export enum GraphType {
+    SVG,
+    Image
+}

package/src/config/graph/graph.ts

@@ -0,0 +1,6 @@
+import { GraphType } from './graph-type';
+
+export class Graph {
+    constructor(public readonly graphType: GraphType, public readonly source: string) {
+    }
+}

package/src/config/history-data/get-history-data-args.ts

@@ -0,0 +1,23 @@
+import * as moment from 'moment';
+import { HistoricalCurveTimeRange } from './historical-curve.time-range';
+
+export class GetHistoryDataArgs {
+    /**
+     * 获取历史数据参数
+     * @param dataSourceCode 数据源编码
+     * @param dataItemName 历史数据条目名称
+     * @param channelNames 通道名称
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param limit 获取数据数量，为负数则倒叙
+     * @param rangeType 区间类型
+     */
+    constructor(readonly dataSourceCode: number,
+        readonly dataItemName: string,
+        readonly channelNames: Array<string>,
+        readonly startTime: moment.Moment,
+        readonly endTime: moment.Moment,
+        readonly limit: number,
+        readonly rangeType: HistoricalCurveTimeRange) {
+    }
+}

package/src/config/history-data/historical-curve.time-range.ts

@@ -0,0 +1,25 @@
+export enum HistoricalCurveTimeRange {
+
+    /**
+     * 全开区间
+     */
+    BeginOpenEndOpen = 0,
+
+
+    /**
+     * 左开右闭
+     */
+    BeginOpenEndClose = 1,
+
+
+    /**
+     * 左闭右开
+     */
+    BeginCloseEndOpen = 2,
+
+
+    /**
+     * 全闭区间
+     */
+    BeginCloseEndClose = 3
+}

package/src/config/history-data/history-data-value.ts

@@ -0,0 +1,6 @@
+import { Moment } from 'moment';
+
+export class HistoryDataValue {
+    constructor(readonly time: Moment, readonly values: Array<number>) {
+    }
+}

package/src/config/history-data/history-data.model.ts

@@ -0,0 +1,6 @@
+import { HistoryDataValue } from './history-data-value';
+
+export class HistoryDataModel {
+    constructor(readonly error: string, readonly isUnbind: boolean, readonly values: Array<HistoryDataValue>) {
+    }
+}

package/src/config/history-data/history-data.store.ts

@@ -0,0 +1,12 @@
+import { Observable } from 'rxjs';
+import { GetHistoryDataArgs } from './get-history-data-args';
+import { HistoryDataModel } from './history-data.model';
+
+export interface HistoryDataStore {
+
+    /**
+     * Get HistoryDatas by target history data info start time and end time
+     * @param input get history data args
+     */
+    getHistoryData(input: GetHistoryDataArgs): Observable<HistoryDataModel>;
+}

package/src/config/image/image-store.ts

@@ -0,0 +1,8 @@
+export interface ImageStore {
+
+    /**
+     * Get image url by image id.
+     */
+    getImageUrl(imageId: string): string;
+
+}

package/src/config/index.ts

@@ -0,0 +1,17 @@
+export { ConfigStore } from './config-store';
+
+export { Graph } from './graph/graph';
+export { GraphResult } from './graph/graph-result';
+export { GraphType } from './graph/graph-type';
+export { GraphStore } from './graph/graph-store';
+
+export { ViewStore } from './view/view-store';
+export { ViewModel } from './view/view.model';
+
+export { ImageStore } from './image/image-store';
+
+export * from './history-data';
+
+export * from './variable';
+
+export * from './alarm';

package/src/config/variable/get-variable-name-args.ts

@@ -0,0 +1,7 @@
+
+export class GetVariableNameArgs {
+    constructor(readonly name: string,
+        readonly groupName: string,
+        readonly code: number) {
+    }
+}

package/src/config/variable/variable-store.ts

@@ -0,0 +1,10 @@
+import { GetVariableNameArgs } from './get-variable-name-args';
+
+export interface VariableStore {
+
+    /**
+     * 老数据转换
+     */
+    getVariableName(input: GetVariableNameArgs): string;
+
+}