【update】fix 循环引用; review by luox

Author: xiongjiaojiao

src/common/commontypes/BaseTypes.js

@@ -1,7 +1,7 @@
 /* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
- import {Util} from './Util';
+ import { CircularUtil } from './CircularUtil';
 
 /**
  * @function inherit
@@ -21,7 +21,7 @@ export var inheritExt = function (C, P) {
         if (typeof o === "function") {
             o = o.prototype;
         }
-        Util.extend(C.prototype, o);
+        CircularUtil.extend(C.prototype, o);
     }
 };
 

src/common/commontypes/CircularUtil.js

@@ -0,0 +1,42 @@
+const CircularUtil = {
+  lastSeqID: 0,
+  createUniqueID: function (prefix) {
+    if (prefix == null) {
+      prefix = 'id_';
+    }
+    CircularUtil.lastSeqID += 1;
+    return prefix + CircularUtil.lastSeqID;
+  },
+  extend: function (destination, source) {
+    destination = destination || {};
+    if (source) {
+      for (var property in source) {
+        var value = source[property];
+        if (value !== undefined) {
+          destination[property] = value;
+        }
+      }
+
+      /**
+       * IE doesn't include the toString property when iterating over an object's
+       * properties with the for(property in object) syntax.  Explicitly check if
+       * the source has its own toString property.
+       */
+
+      /*
+       * FF/Windows < 2.0.0.13 reports "Illegal operation on WrappedNative
+       * prototype object" when calling hawOwnProperty if the source object
+       * is an instance of window.Event.
+       */
+
+      var sourceIsEvt = typeof window.Event === 'function' && source instanceof window.Event;
+
+      if (!sourceIsEvt && source.hasOwnProperty && source.hasOwnProperty('toString')) {
+        destination.toString = source.toString;
+      }
+    }
+    return destination;
+  }
+};
+
+export { CircularUtil };

src/common/commontypes/Geometry.js

@@ -3,7 +3,7 @@
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 // import {WKT} from '../format/WKT';
 // import {Vector} from './Vector';
-import {Util} from './Util';
+import { CircularUtil } from './CircularUtil';
 
 /**
  * @class Geometry
@@ -22,7 +22,7 @@ export class Geometry {
          * @description  几何对象的唯一标识符。
          *
          */
-        this.id = Util.createUniqueID(this.CLASS_NAME + "_");
+        this.id = CircularUtil.createUniqueID(this.CLASS_NAME + "_");
 
         /**
          * @member {Geometry} Geometry.prototype.parent

src/common/commontypes/Util.js

@@ -4,6 +4,7 @@
 import { StringExt } from './BaseTypes';
 import { Geometry } from './Geometry';
 import URI from 'urijs';
+import { CircularUtil } from './CircularUtil';
 
 /**
  * @description 浏览器名称，依赖于 userAgent 属性，BROWSER_NAME 可以是空，或者以下浏览器：<br>
@@ -168,36 +169,7 @@ const Util = {
    * @returns {Object} 目标对象。
    */
 
-  extend: function (destination, source) {
-    destination = destination || {};
-    if (source) {
-      for (var property in source) {
-        var value = source[property];
-        if (value !== undefined) {
-          destination[property] = value;
-        }
-      }
-
-      /**
-       * IE doesn't include the toString property when iterating over an object's
-       * properties with the for(property in object) syntax.  Explicitly check if
-       * the source has its own toString property.
-       */
-
-      /*
-       * FF/Windows < 2.0.0.13 reports "Illegal operation on WrappedNative
-       * prototype object" when calling hawOwnProperty if the source object
-       * is an instance of window.Event.
-       */
-
-      var sourceIsEvt = typeof window.Event === 'function' && source instanceof window.Event;
-
-      if (!sourceIsEvt && source.hasOwnProperty && source.hasOwnProperty('toString')) {
-        destination.toString = source.toString;
-      }
-    }
-    return destination;
-  },
+  extend: CircularUtil.extend,
   /**
    * @memberOf CommonUtil
    * @description 对象拷贝。
@@ -583,21 +555,15 @@ const Util = {
    * @type {number}
    * @default 0
    */
-  lastSeqID: 0,
+  lastSeqID: CircularUtil.lastSeqID,
 
   /**
    * @memberOf CommonUtil
    * @description 创建唯一 ID 值。
    * @param {string} [prefix] - 前缀。
    * @returns {string} 唯一的 ID 值。
    */
-  createUniqueID: function (prefix) {
-    if (prefix == null) {
-      prefix = 'id_';
-    }
-    Util.lastSeqID += 1;
-    return prefix + Util.lastSeqID;
-  },
+  createUniqueID: CircularUtil.createUniqueID,
 
   /**
    * @memberOf CommonUtil

test/common/commontypes/UtilSpec.js

@@ -386,4 +386,16 @@ describe('Util', () => {
         expect(result.textHeight).toEqual(18);
     });
 
+    it('createUniqueID', () => {
+        let id = Util.createUniqueID();
+        expect(id).toBe('id_0');
+        expect(Util.lastSeqID).toBe(0);
+        id = Util.createUniqueID('custom_');
+        expect(id).toBe('custom_1');
+        expect(Util.lastSeqID).toBe(1);
+        id = Util.createUniqueID();
+        expect(id).toBe('id_2');
+        expect(Util.lastSeqID).toBe(2);
+    })
+
 });