@chaoswise/ui 2.7.6 → 2.7.8

package/lib/TimeRangeSlider/utils/index.js

@@ -15,49 +15,60 @@ var _require = require("uuid"),
   uuidv4 = _require.v4;
 // 枚举时间单位
 var ENUM_TimeUnit = {
-  s: ["Second", "Seconds", "秒", "seconds"],
-  m: ["Minute", "Minutes", "分钟", "minutes"],
-  h: ["Hour", "Hours", "小时", "hours"],
-  d: ["Day", "Days", "天", "days"],
-  mo: ["Month", "Months", "月", "mo"],
-  y: ["Year", "Years", "年", "years"]
-};
-var EnumTimeType = {
-  recently: "recentlyArray",
-  relative: "relativeArray",
-  absolute: "absoluteArray",
-  unixTimestamp: "unixTimestampArray",
-  other: "otherArray"
-};
-
-/**
- * 变换数据源格式
- * @param {Array} 数据源
- * @returns 重新编排组合的数据源
- */
-export var regroupDataSourceFn = function regroupDataSourceFn(dataSource) {
-  var recentlyArray = [];
-  var relativeArray = [];
-  var absoluteArray = [];
-  var unixTimestampArray = [];
-  var otherArray = [];
-  var regroupDataSource = [];
-  dataSource.forEach(function (item) {
-    if (EnumTimeType[item.type]) {
-      eval(EnumTimeType[item.type]).push(item);
-    } else {
-      eval(EnumTimeType["other"]).push(item);
-    }
-  });
-  Object.entries(EnumTimeType).map(function (item) {
-    if (eval(item[1]).length) {
-      var newObj = {};
-      newObj.type = item[0];
-      newObj.timeList = eval(item[1]);
-      regroupDataSource.push(newObj);
-    }
-  });
-  return regroupDataSource;
+  s: {
+    zh_CN: "秒",
+    en_US: {
+      singular: "Second",
+      plural: "Seconds"
+    },
+    zh_TW: "秒",
+    unit: "seconds"
+  },
+  m: {
+    zh_CN: "分钟",
+    en_US: {
+      singular: "Minute",
+      plural: "Minutes"
+    },
+    zh_TW: "分鐘",
+    unit: "minutes"
+  },
+  h: {
+    zh_CN: "小时",
+    en_US: {
+      singular: "Hour",
+      plural: "Hours"
+    },
+    zh_TW: "小時",
+    unit: "hours"
+  },
+  d: {
+    zh_CN: "天",
+    en_US: {
+      singular: "Day",
+      plural: "Days"
+    },
+    zh_TW: "天",
+    unit: "days"
+  },
+  mo: {
+    zh_CN: "月",
+    en_US: {
+      singular: "Month",
+      plural: "Months"
+    },
+    zh_TW: "月",
+    unit: "mo"
+  },
+  y: {
+    zh_CN: "年",
+    en_US: {
+      singular: "Year",
+      plural: "Years"
+    },
+    zh_TW: "年",
+    unit: "years"
+  }
 };
 
 // 捕获匹配值
@@ -111,18 +122,60 @@ export var judgeType = function judgeType(recordDateValue) {
   return [isRule, captureUnit, recordUnit];
 };
 export var echoRecentlyTimeTitle = function echoRecentlyTimeTitle(locale, captureUnit) {
-  // todo： 需要优化
-  if (locale == "zh_CN" || locale == "zh" || locale == "zh_TW") {
-    if (captureUnit[1] === "mo") {
-      return "\u6700\u8FD1".concat(captureUnit[0], "\u4E2A").concat(ENUM_TimeUnit.mo[2]);
-    }
-    return "\u6700\u8FD1".concat(captureUnit[0]).concat(ENUM_TimeUnit[captureUnit[1]][2]);
-  } else {
-    if (captureUnit[0] == 1) {
-      return "Past ".concat(captureUnit[0], " ").concat(ENUM_TimeUnit[captureUnit[1]][0]);
-    }
-    return "Past ".concat(captureUnit[0], " ").concat(ENUM_TimeUnit[captureUnit[1]][1]);
+  // 参数验证
+  if (!captureUnit || !Array.isArray(captureUnit) || captureUnit.length < 2) {
+    return "";
+  }
+  var _captureUnit3 = _slicedToArray(captureUnit, 2),
+    count = _captureUnit3[0],
+    unit = _captureUnit3[1];
+  var timeUnit = ENUM_TimeUnit[unit];
+  if (!timeUnit) {
+    return "";
   }
+  var countNum = parseInt(count, 10);
+
+  // 语言配置映射
+  var localeConfig = {
+    zh_CN: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === "mo" ? "个" : "").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_CN;
+      }
+    },
+    zh: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === "mo" ? "个" : "").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_CN;
+      }
+    },
+    zh_TW: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === "mo" ? "個" : "").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_TW;
+      }
+    },
+    "default": {
+      template: function template(count, unitText) {
+        return "Past ".concat(count, " ").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        var isPlural = countNum !== 1;
+        return isPlural ? timeUnit.en_US.plural : timeUnit.en_US.singular;
+      }
+    }
+  };
+
+  // 获取当前语言配置，如果不存在则使用默认配置
+  var config = localeConfig[locale] || localeConfig["default"];
+  var unitText = config.getUnitText();
+  return config.template(count, unitText);
 };
 export var echoAbsoluteTimeTitle = function echoAbsoluteTimeTitle(value, format) {
   var hasTimeSpan = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -230,7 +283,7 @@ export var computeTimeSpan = function computeTimeSpan(value, timeSpanBoundary) {
 };
 
 /**
- * 
+ *
  * @param {*} value date日期
  * @returns 根据日期获取时间跨度，最近时间返回内容
  */
@@ -247,7 +300,7 @@ export var getTimeSpanFromValue = function getTimeSpanFromValue(value, timeSpanB
 };
 
 /**
- * 
+ *
  * @param {*} value date日期
  * @returns 根据日期计算最近的时间
  */
@@ -353,7 +406,6 @@ export var cloneChangeDate = function cloneChangeDate(currentDate_0, currentDate
  */
 export var getChangeUnitDate = function getChangeUnitDate(unitFigure, unit) {
   var value = [moment().subtract(unitFigure, unit), moment()];
-  ;
   if (unit === "mo") {
     value[0] = moment().subtract(unitFigure * 31, "d");
   }
@@ -380,7 +432,7 @@ export var getChangeDate = function getChangeDate(recordDateValue, direction) {
     value = funcValueChangeArrayValue(values);
   }
   if (isRule && !values) {
-    value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]][3]);
+    value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]].unit);
   }
   var timeDiff = value[1].diff(value[0]);
   var duration = moment.duration(timeDiff);
@@ -429,7 +481,7 @@ export var funcValueChangeArrayValue = function funcValueChangeArrayValue(value)
 
 // 判断是否为最近时间规则，并返回矫正之后的value值
 export var getCorrectValue = function getCorrectValue(value) {
-  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
   var _getUnit5 = getUnit(key),
     isRule = _getUnit5.isRule,
     captureUnit = _getUnit5.captureUnit;
@@ -632,7 +684,7 @@ var parseInputDate = function parseInputDate(text) {
       if (format === "X") {
         if (text.length !== 10) {
           finalDate = null;
-          finalFormat = '';
+          finalFormat = "";
         }
       }
       return {

package/lib/TreeSelect111/locale/index.js

@@ -1,10 +1,12 @@
 import zh_CN from './zh_CN.js';
 import en_US from './en_US.js';
 import zh_TW from './zh_TW.js';
+import ja_JP from './ja_JP.js';
 export default {
   zh_CN: zh_CN,
   en_US: en_US,
   zh_TW: zh_TW,
+  ja_JP: ja_JP,
   // 兼容
   zh: zh_CN,
   en: en_US

package/lib/TreeSelect111/locale/ja_JP.js

@@ -0,0 +1,3 @@
+export default {
+  "checkAll": "すべて選択"
+};

package/lib/WangEditor/index.js

@@ -6,13 +6,14 @@ import React, { useEffect, Fragment, useRef, forwardRef } from "react";
 import E from "./wangEditor";
 import PropTypes from "prop-types";
 import "./index.less";
-import { localeObj, localObjTW } from "./locale/index";
+import { localeObj, localObjTW, localObjJA } from "./locale/index";
 import usePreview from "../usePreview";
 import resizeable from "./resizeable";
 var localOptionsMap = {
   en: localeObj,
   en_US: localeObj,
   zh_TW: localObjTW,
+  ja_JP: localObjJA,
   zh: {},
   zh_CN: {}
 };

package/lib/WangEditor/locale/index.js

@@ -59,4 +59,35 @@ export var localObjTW = {
   插入: "插入",
   创建: "創建",
   图片: "圖片"
+};
+export var localObjJA = {
+  设置标题: "見出し",
+  正文: "本文",
+  链接文字: "リンクテキスト",
+  链接: "リンク",
+  上传图片: "ローカル",
+  上传: "アップロード",
+  有序列表: "順序付きリスト",
+  无序列表: "順序なしリスト",
+  靠左: "左揃え",
+  居中: "中央揃え",
+  靠右: "右揃え",
+  字号: "フォントサイズ",
+  字体: "フォント",
+  文字颜色: "文字色",
+  背景色: "背景色",
+  设置列表: "リスト",
+  插入代码: "コード",
+  插入视频: "動画",
+  格式如: "形式例",
+  插入表格: "テーブル",
+  列的表格: "列",
+  行: "行",
+  默认: "デフォルト",
+  新浪: "Sina",
+  对齐方式: "配置",
+  网络图片: "Web",
+  插入: "挿入",
+  创建: "作成",
+  图片: "画像"
 };

package/lib/treeLoad/index.js

@@ -1,46 +1,79 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from "react";
-import PropTypes from 'prop-types';
+import PropTypes from "prop-types";
+
 /**
- * 
  * 封装的树形结构懒加载组件
  */
 function fetchTreeNode(oldData, parentId, childNode) {
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var _options$keyField = options.keyField,
+    keyField = _options$keyField === void 0 ? "value" : _options$keyField,
+    compareFn = options.compareFn;
   return oldData.map(function (item) {
-    if (item.value === parentId) {
-      item.children = childNode;
+    var isMatch = false;
+    if (compareFn) {
+      isMatch = compareFn(item, parentId);
+    } else {
+      var itemKey = item[keyField];
+      isMatch = itemKey === parentId;
+    }
+    if (isMatch) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        children: childNode
+      });
     } else if (item.children) {
-      item.children = fetchTreeNode(item.children, parentId, childNode);
+      return _objectSpread(_objectSpread({}, item), {}, {
+        children: fetchTreeNode(item.children, parentId, childNode, options)
+      });
     }
     return item;
   });
 }
-function treeLoad(oldData, treeNodeKey, fetchData, getChildNode) {
+// 1. 旧版API: treeLoad(oldData, treeNodeKey, fetchData, getChildNode)
+// 2. 新版API: treeLoad(oldData, treeNodeKey, fetchData, options)
+// 3. 混合API-1: treeLoad(oldData, treeNodeKey, fetchData, getChildNode, options) - 第四个参数是函数，第五个是对象
+// 4. 混合API-2: treeLoad(oldData, treeNodeKey, fetchData, options, getChildNode) - 第四个参数是对象，第五个是函数
+
+function treeLoad(oldData, treeNodeKey, fetchData, getChildNodeOrOptions, maybeOptions) {
+  // 兼容旧版API: 第四个参数可能是getChildNode回调函数或options对象
+  var getChildNode;
+  var options = {};
+  if (typeof getChildNodeOrOptions === "function") {
+    // 旧版API: 第四个参数是getChildNode回调函数
+    getChildNode = getChildNodeOrOptions;
+    // 如果第五个参数是对象，则作为options
+    if (maybeOptions && _typeof(maybeOptions) === "object") {
+      options = maybeOptions;
+    }
+  } else if (getChildNodeOrOptions && _typeof(getChildNodeOrOptions) === "object") {
+    // 新版API: 第四个参数是options对象
+    options = getChildNodeOrOptions;
+    // 如果提供了第五个参数且为函数，则视为getChildNode
+    if (typeof maybeOptions === "function") {
+      getChildNode = maybeOptions;
+    }
+  }
   fetchData(treeNodeKey, function (childNode) {
-    var newData = fetchTreeNode(oldData, treeNodeKey, childNode);
+    var newData = fetchTreeNode(oldData, treeNodeKey, childNode, options);
     getChildNode && getChildNode();
     return newData;
   });
 }
-treeLoad.defaultProps = {
-  // 
-};
 treeLoad.propTypes = {
-  /**
-   * 获取子节点的数据，并通过回调函数返回最终渲染的数据。
-   * function(pageNum,callback(res):Data)
-   */
   fetchData: PropTypes.func,
-  /**
-   * 加载前的树形结构数据,结构中把value作为唯一键值
-   */
   oldData: PropTypes.array,
-  /**
-   * 要展开的树节点
-   */
   treeNodeKey: PropTypes.string,
-  /**
-   * 获取子树数据时额外执行的回调函数。
-   */
-  getChildNode: PropTypes.func
+  getChildNode: PropTypes.func,
+  options: PropTypes.shape({
+    keyField: PropTypes.string,
+    // 指定用于匹配的字段名
+    compareFn: PropTypes.func // 自定义比较函数
+  })
 };
 export default treeLoad;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.7.6",
+  "version": "2.7.8",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -107,7 +107,7 @@
     "react-custom-scrollbars": "^4.2.1",
     "react-dnd": "^13.1.1",
     "react-dnd-html5-backend": "^12.1.1",
-    "react-draggable": "^4.4.3",
+    "react-draggable": "4.4.6",
     "react-infinite-scroller": "^1.2.4",
     "react-intl": "^6.0.5",
     "react-joyride": "2.3.2",
@@ -151,6 +151,5 @@
   "license": "MIT",
   "overrides": {
     "node-fetch": "^2.7.0"
-  },
-  "gitHead": "54db53013c7d2b04e8cfc7f336eb71fa54da5024"
+  }
 }