bbj-screen-widget 2.4.44 → 2.4.46

package/core/package.json

@@ -1,11 +1,3 @@
-{
-  "main": "../bundles/bbj-screen-widget-core.umd.js",
-  "module": "../fesm2015/bbj-screen-widget-core.js",
-  "es2015": "../fesm2015/bbj-screen-widget-core.js",
-  "esm2015": "../esm2015/core/bbj-screen-widget-core.js",
-  "fesm2015": "../fesm2015/bbj-screen-widget-core.js",
-  "typings": "bbj-screen-widget-core.d.ts",
-  "metadata": "bbj-screen-widget-core.metadata.json",
-  "sideEffects": false,
-  "name": "bbj-screen-widget/core"
+{
+    "ngPackage": {}
 }

package/core/src/service/baidu-map.service.ts

@@ -0,0 +1,107 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { LazyService } from '@delon/util';
+
+declare const BMap;
+declare const BMapGL;
+
+@Injectable({ providedIn: 'root' })
+export class BaiduMapService {
+  private loadMapPromise: Promise<any>;
+  private loadMapGLPromise: Promise<any>;
+  private loadMarkerClustererPromise: Promise<any>;
+  private loadMarkerClustererGLPromise: Promise<any>;
+  private loadMapVGLPromise: Promise<any>;
+  private ak = 'zNYVPOghDzZPhyXg9hkjvBgcGhZGBms2';
+  constructor(public lazy: LazyService) {}
+
+  loadScript(url: string, callback: string) {
+    return new Promise<void>((resolve) => {
+      (window as any)[callback] = () => {
+        resolve();
+        delete window[callback];
+      };
+      var script = document.createElement('script');
+      script.type = 'text/javascript';
+      script.src = url + `&ak=${this.ak}&callback=${callback}`;
+      document.body.appendChild(script);
+    });
+  }
+
+  loadMap(): Promise<any> {
+    if (typeof BMap !== 'undefined') {
+      return Promise.resolve();
+    }
+    if (!this.loadMapPromise) {
+      this.loadMapPromise = this.loadScript('https://api.map.baidu.com/api?v=3.0', 'loadBMapCallback');
+    }
+    return this.loadMapPromise;
+  }
+
+  loadMapGL(): Promise<any> {
+    if (typeof BMapGL !== 'undefined') {
+      return Promise.resolve();
+    }
+    if (!this.loadMapGLPromise) {
+      this.loadMapGLPromise = this.loadScript(
+        'https://api.map.baidu.com/api?type=webgl&v=1.0',
+        'loadBMapGLCallback',
+      ).then(() => {
+        // 百度地图重写了contains方法，当参数为null时会报错，这里把它重写回来
+        HTMLElement.prototype.contains = function (e) {
+          if (e) {
+            if (e == this) {
+              return true;
+            }
+            while ((e = e.parentNode)) {
+              if (e == this) {
+                return true;
+              }
+            }
+          }
+          return false;
+        };
+      });
+    }
+    return this.loadMapGLPromise;
+  }
+
+  // loadMarkerClusterer() {
+  //   if (!this.loadMarkerClustererPromise) {
+  //     this.loadMarkerClustererPromise = Promise.all([
+  //       this.lazy.loadScript('assets/js/BMap/MarkerClusterer_min.js'),
+  //       this.lazy.loadScript('assets/js/BMap/TextIconOverlay_min.js'),
+  //     ]);
+  //   }
+  //   return this.loadMarkerClustererPromise;
+  // }
+
+  // loadMarkerClustererGL() {
+  //   if (!this.loadMarkerClustererGLPromise) {
+  //     this.loadMarkerClustererGLPromise = Promise.all([
+  //       this.lazy.loadScript('assets/js/BMapGL/MarkerClusterer_min.js'),
+  //       this.lazy.loadScript('assets/js/BMapGL/TextIconOverlay_min.js'),
+  //     ]);
+  //   }
+  //   return this.loadMarkerClustererGLPromise;
+  // }
+
+  loadMapVGL() {
+    if (!this.loadMapVGLPromise) {
+      this.loadMapVGLPromise = this.lazy.loadScript('assets/js/BMapGL/mapvgl.min.js');
+      this.loadMapVGLPromise.catch((e) => {
+        console.error(e);
+        this.loadMapGLPromise = null;
+      });
+    }
+    return this.loadMapVGLPromise;
+  }
+
+  async localCity() {
+    await this.loadMapGL();
+    return new Promise<any>((resolve) => {
+      const myCity = new BMapGL.LocalCity();
+      myCity.get(resolve);
+    });
+  }
+}

package/karma.conf.js

@@ -0,0 +1,32 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/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
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, '../../coverage/screen-widget'),
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true
+  });
+};

package/ng-package.json

@@ -0,0 +1,59 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/screen-widget",
+  "lib": {
+    "entryFile": "src/public-api.ts",
+    "umdModuleIds": {
+      "@delon/util": "@delon/util",
+      "@delon/util/other":"@delon/util/other",
+      "@fullcalendar/angular": "@fullcalendar/angular",
+      "@fullcalendar/daygrid": "@fullcalendar/daygrid",
+      "@fullcalendar/timegrid": "@fullcalendar/timegrid",
+      "@fullcalendar/resource-timeline":"@fullcalendar/resource-timeline",
+      "@fullcalendar/interaction": "@fullcalendar/interaction",
+      "date-fns": "date-fns",
+      "date-fns/fp":"date-fns/fp",
+      "echarts": "echarts",
+      "ngx-echarts": "ngx-echarts",
+      "ng-zorro-antd/button": "ng-zorro-antd/button",
+      "ng-zorro-antd/checkbox": "ng-zorro-antd/checkbox",
+      "ng-zorro-antd/core/highlight":"ng-zorro-antd/core/highlight",
+      "ng-zorro-antd/core/no-animation":"ng-zorro-antd/core/no-animation",
+      "ng-zorro-antd/core/resize-observers":"ng-zorro-antd/core/resize-observers",
+      "ng-zorro-antd/core/transition-patch": "ng-zorro-antd/core/transition-patch",
+      "ng-zorro-antd/core/wave": "ng-zorro-antd/core/wave",
+      "ng-zorro-antd/date-picker": "ng-zorro-antd/date-picker",
+      "ng-zorro-antd/dropdown":"ng-zorro-antd/dropdown",
+      "ng-zorro-antd/icon": "ng-zorro-antd/icon",
+      "ng-zorro-antd/input": "ng-zorro-antd/input",
+      "ng-zorro-antd/i18n":"ng-zorro-antd/i18n",
+      "ng-zorro-antd/message": "ng-zorro-antd/message",
+      "ng-zorro-antd/pipes":"ng-zorro-antd/pipes",
+      "ng-zorro-antd/rate": "ng-zorro-antd/rate",
+      "ng-zorro-antd/radio": "ng-zorro-antd/radio",
+      "ng-zorro-antd/select": "ng-zorro-antd/select",
+      "ng-zorro-antd/slider": "ng-zorro-antd/slider",
+      "ng-zorro-antd/space":"ng-zorro-antd/space",
+      "ng-zorro-antd/table": "ng-zorro-antd/table",
+      "ng-zorro-antd/tabs": "ng-zorro-antd/tabs",
+      "ng-zorro-antd/time-picker": "ng-zorro-antd/time-picker",
+      "ng-zorro-antd/tooltip":"ng-zorro-antd/tooltip",
+      "ng-zorro-antd/tree": "ng-zorro-antd/tree",
+      "ng-zorro-antd/upload": "ng-zorro-antd/upload",
+      "swiper/angular":"swiper/angular",
+      "swiper/core":"swiper/core",
+      "bbj-widget-base": "bbj-widget-base",
+      "util": "util",
+      "uuid":"uuid"
+    }
+  },
+  "assets": ["src/assets"],
+  "allowedNonPeerDependencies": [
+    "@fullcalendar/angular",
+    "@fullcalendar/daygrid",
+    "@fullcalendar/interaction",
+    "@fullcalendar/resource-timeline",
+    "@fullcalendar/timegrid",
+    "swiper"
+  ]
+}

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "bbj-screen-widget",
-  "version": "2.4.44",
+  "version": "2.4.46",
   "dependencies": {
     "@fullcalendar/angular": "~5.5.0",
     "@fullcalendar/daygrid": "~5.5.0",
     "@fullcalendar/interaction": "~5.5.0",
     "@fullcalendar/resource-timeline": "~5.5.0",
     "@fullcalendar/timegrid": "~5.5.0",
-    "swiper": "6.5.0",
-    "tslib": "^2.0.0"
+    "swiper":"6.8.1"
   },
   "peerDependencies": {
     "@angular/common": "^11.0.0",
@@ -18,13 +17,5 @@
     "echarts": "^5.0.1",
     "echarts-gl": "^2.0.0",
     "echarts-liquidfill": "^3.0.0"
-  },
-  "main": "bundles/bbj-screen-widget.umd.js",
-  "module": "fesm2015/bbj-screen-widget.js",
-  "es2015": "fesm2015/bbj-screen-widget.js",
-  "esm2015": "esm2015/bbj-screen-widget.js",
-  "fesm2015": "fesm2015/bbj-screen-widget.js",
-  "typings": "bbj-screen-widget.d.ts",
-  "metadata": "bbj-screen-widget.metadata.json",
-  "sideEffects": false
-}
+  }
+}