releases 3.7.4

x-extends · Mar 6, 2025 · d40b407 · d40b407
1 parent 38cb1b9
commit d40b407
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 15 deletions.
diff --git a/func/ctor.d.ts b/func/ctor.d.ts
@@ -3,12 +3,20 @@ import SetupDefaults from './setupDefaults'
 /**
  * 版本信息
  */
-export const VERSION: string;
+export const version: string
 
 /**
- * 设置全局参数
+ * 设置全局配置
  * @param options 全局参数
  */
+export function setConfig(options: SetupDefaults): SetupDefaults;
+
+/**
+ * 获取全局配置
+ */
+export function getConfig(): SetupDefaults;
+
+export const VERSION: string
 export function setup(options: SetupDefaults): SetupDefaults;
 
 /**
@@ -18,16 +26,20 @@ export function setup(options: SetupDefaults): SetupDefaults;
 export function mixin(...methods: {[key: string]: any}[]): void;
 
 export interface XEUtilsMethods {
+  version: typeof version;
+  setConfig: typeof setConfig;
+  getConfig: typeof getConfig;
+  mixin: typeof mixin;
+
   VERSION: typeof VERSION;
   setup: typeof setup;
-  mixin: typeof mixin;
 
   [propertys: string]: any;
 }
 
 /**
  * JavaScript 函数库、工具类
  */
-declare var XEUtils: XEUtilsMethods
+declare let XEUtils: XEUtilsMethods
 
 export default XEUtils
diff --git a/func/ctor.js b/func/ctor.js
@@ -22,12 +22,21 @@ function mixin () {
   })
 }
 
-function setup (options) {
+function setConfig (options) {
   return assign(setupDefaults, options)
 }
 
-XEUtils.VERSION = '@VERSION'
+function getConfig () {
+  return setupDefaults
+}
+
+var version = '@VERSION'
+
+XEUtils.VERSION = version
+XEUtils.version = version
 XEUtils.mixin = mixin
-XEUtils.setup = setup
+XEUtils.setup = setConfig
+XEUtils.setConfig = setConfig
+XEUtils.getConfig = getConfig
 
 module.exports = XEUtils
diff --git a/func/setupDefaults.d.ts b/func/setupDefaults.d.ts
@@ -4,7 +4,11 @@ import { ToDateStringFormats } from "./toDateString"
 
 export interface SetupDefaults {
   /**
-   * 默认树的转换配置  
+   * 全局唯一标识
+   */
+  keyId?: number
+  /**
+   * 默认树的转换配置
    * 用于 toArrayTree()、toTreeArray()
    */
   treeOptions?: {
@@ -16,22 +20,22 @@ export interface SetupDefaults {
     [key: string]: any;
   };
   /**
-   * 默认解析的日期格式  
+   * 默认解析的日期格式
    * 用于 toDateString()
    */
   parseDateFormat?: string;
   /**
-   * 默认格式化日期的规则  
+   * 默认格式化日期的规则
    * 用于 toDateString()
    */
   parseDateRules?: ToDateStringFormats;
   /**
-   * 默认周视图的起始天  
+   * 默认周视图的起始天
    * 用于 getWhatWeek()、getYearWeek()、toDateString()
    */
   firstDayOfWeek?: FirstDayOfWeek;
   /**
-   * 分隔函数配置  
+   * 分隔函数配置
    * 用于 commafy()
    */
   commafyOptions?: CommafyOptions;

diff --git a/func/setupDefaults.js b/func/setupDefaults.js
@@ -1,6 +1,7 @@
 'use strict'
 
 var setupDefaults = {
+  keyId: 1,
   cookies: {
     path: '/'
   },

diff --git a/func/uniqueId.js b/func/uniqueId.js
@@ -1,3 +1,5 @@
+var setupDefaults = require('./setupDefaults')
+
 var eqNull = require('./eqNull')
 
 /**
@@ -6,9 +8,8 @@ var eqNull = require('./eqNull')
   * @param {String} prefix 前缀
   * @return {Number}
   */
-let __uniqueId = 1
 function uniqueId (prefix) {
-  return '' + (eqNull(prefix) ? '' : prefix) + __uniqueId++
+  return '' + (eqNull(prefix) ? '' : prefix) + (setupDefaults.keyId++)
 }
 
 module.exports = uniqueId
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xe-utils",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "description": "JavaScript 函数库、工具类",
   "main": "index.js",
   "unpkg": "dist/xe-utils.umd.min.js",