@chaoswise/ui 2.6.6 → 2.6.7

package/lib/CWMessage/MessageContent/TabList/index.js

@@ -11,11 +11,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 import React from "react";
-// import moment from "moment";
-
+import moment from "moment";
 import { readInnerMessageApi } from "../../service";
 import langConfig from "../../locale";
-import { formatMessage, setMomentByTimeZone, getFormatByLocalStorage } from "../../../utils";
+import { formatMessage } from "../../../utils";
 import "./index.less";
 var TabList = function TabList(props) {
   var _props$messages = props.messages,
@@ -30,7 +29,8 @@ var TabList = function TabList(props) {
     setVisible = props.setVisible,
     requestOption = props.requestOption,
     code = props.code,
-    onTabListAllRead = props.onTabListAllRead;
+    onTabListAllRead = props.onTabListAllRead,
+    renderMessageDateFormat = props.renderMessageDateFormat;
   var _useLocale = _useLocale2(langConfig),
     localeObj = _useLocale.langObj;
   var _readInnerMessageApi = requestOption.readInnerMessageApi;
@@ -108,7 +108,7 @@ var TabList = function TabList(props) {
       className: "cw-message-content-tabs-list-desc"
     }, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary : ""), /*#__PURE__*/React.createElement("div", {
       className: "cw-message-content-tabs-list-date"
-    }, message.time ? setMomentByTimeZone(Number(message.time)).format(getFormatByLocalStorage("YYYY/MM/DD HH:mm:ss")) : ""));
+    }, message.time ? renderMessageDateFormat ? renderMessageDateFormat(Number(message.time)) : moment(Number(message.time)).format("YYYY/MM/DD HH:mm:ss") : ""));
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     className: "cw-message-content-all-read",

package/lib/CWMessage/MessageContent/index.js

@@ -56,7 +56,8 @@ var MessageContent = function MessageContent(props) {
     isClose = props.isClose,
     requestOption = props.requestOption,
     onTabListAllRead = props.onTabListAllRead,
-    conditionsRef = props.conditionsRef;
+    conditionsRef = props.conditionsRef,
+    renderMessageDateFormat = props.renderMessageDateFormat;
   var history = useHistory();
   var _useThemeSwitcher = useThemeSwitcher(),
     themeVars = _useThemeSwitcher.themeVars;
@@ -246,7 +247,8 @@ var MessageContent = function MessageContent(props) {
       setVisible: setVisible,
       requestOption: requestOption,
       code: item.code,
-      onTabListAllRead: onTabListAllRead
+      onTabListAllRead: onTabListAllRead,
+      renderMessageDateFormat: renderMessageDateFormat
     }) : /*#__PURE__*/React.createElement(_Empty, {
       description: emptyDescription
     }), /*#__PURE__*/React.createElement("div", {

package/lib/CWMessage/index.js

@@ -60,7 +60,9 @@ function Message(props) {
     _props$strongMessageO = props.strongMessageOption,
     strongMessageOption = _props$strongMessageO === void 0 ? {} : _props$strongMessageO,
     _props$onSocketChange = props.onSocketChange,
-    onSocketChange = _props$onSocketChange === void 0 ? function () {} : _props$onSocketChange;
+    onSocketChange = _props$onSocketChange === void 0 ? function () {} : _props$onSocketChange,
+    _props$renderMessageD = props.renderMessageDateFormat,
+    renderMessageDateFormat = _props$renderMessageD === void 0 ? function () {} : _props$renderMessageD;
   var _useConfigContext = _useConfigContext2(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -366,7 +368,8 @@ function Message(props) {
     requestOption: requestOption,
     onTabListAllRead: onTabListAllRead,
     closable: closable,
-    conditionsRef: conditionsRef
+    conditionsRef: conditionsRef,
+    renderMessageDateFormat: renderMessageDateFormat
   })));
 }
 Message.defaultProps = {
@@ -431,6 +434,10 @@ Message.propTypes = {
   /**
    * 强提醒配置strongMessageOption = {onClickStrongMessageItem = ()=>{},点击强提醒项后的回调}
    */
-  strongMessageOption: PropTypes.object
+  strongMessageOption: PropTypes.object,
+  /**
+   * 渲染消息时间格式，function(时间戳)=>{},
+   */
+  renderMessageDateFormat: PropTypes.func
 };
 export default Message;

package/lib/QuickTransfer/index.js

@@ -232,11 +232,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     // 设置数据源
     setData(dataSource);
-    if (type === "list") {
-      if (targetKeys) {
-        setListCheckedStyle(targetKeys, dataSource);
-      }
-    }
   }, [dataSource]);
   useEffect(function () {
     //传入的当前选中的key
@@ -262,6 +257,21 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
           return !i.disabled;
         }));
         setCheckValue(finalCheckValue);
+        var newData = [];
+        var listCheckedKeys_ = [];
+        dataSource.forEach(function (item, index) {
+          if (isMath(item.title, saveSearchValueLeft)) {
+            newData.push(dataSource[index]);
+          }
+        });
+        listCheckedKeys_ = newData.filter(function (item) {
+          return finalCheckValue.find(function (i) {
+            return i.key == item.key;
+          });
+        }).map(function (item) {
+          return item.key;
+        });
+        setListCheckedStyle(listCheckedKeys_, newData);
       }
       //回显table
       if (type === "table") {
@@ -277,7 +287,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
     }
-  }, [targetKeys, dataSource]);
+  }, [targetKeys, dataSource, saveSearchValueLeft]);
   //触发前端自定义搜索
   useEffect(function () {
     if (searchValueLeft !== undefined) {

package/lib/utils/index.js

@@ -91,19 +91,22 @@ export var formatMessage = function formatMessage(message) {
 
 /**
  * 根据特定时区将时间戳转换为固定时间偏移量的时间对象
- * @param {*} time     时间参数 作为moment的值
- * @param {*} countryCityCode    自定义时区 需要转化的时区值
- * @returns {moment.Moment}  返回的moment对象
+ * @param {*} time - 时间参数，可以是时间戳、日期字符串或 moment 对象
+ * @param {*} defaultCountryCityCode - 默认时区代码，默认为本地时区（通过 moment.tz.guess() 自动检测）
+ * @param {*} countryCityCode - 自定义时区代码，用于覆盖默认时区
+ * @returns {moment.Moment} 返回转换为指定时区的 moment 对象
  */
-export var setMomentByTimeZone = function setMomentByTimeZone(time, countryCityCode) {
-  // 从localStorage获取时区信息
+export var setDateByTimeZone = function setDateByTimeZone(time) {
+  var defaultCountryCityCode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : moment.tz.guess();
+  var countryCityCode = arguments.length > 2 ? arguments[2] : undefined;
+  // 从 localStorage 获取时区信息
   var timeZoneData = JSON.parse(localStorage.getItem('cw_timeZone'));
-
-  // 如果 localStorage 中找不到时区信息，则使用 moment.tz.guess() 自动推测本地时区
-  var timezone = timeZoneData ? timeZoneData.countryCityCode : moment.tz.guess();
+  // 如果 localStorage 中没有找到时区信息，则使用默认时区（自动推测的本地时区）
+  var timezone = timeZoneData ? timeZoneData.countryCityCode : defaultCountryCityCode;
+  // 如果有传入的自定义时区代码，则使用自定义时区，否则使用从 localStorage 获取或推测的时区
   var _timezone = countryCityCode ? countryCityCode : timezone;
-  // （如时间戳或moment对象）
-  return moment.tz(time, _timezone); // 直接使用时区创建moment对象
+  // 返回转换为指定时区的 moment 对象
+  return moment.tz(time, _timezone);
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.6.6",
+  "version": "2.6.7",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -149,5 +149,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "d8ab9b19eea2bb894165d1797057153592cb85f7"
+  "gitHead": "fe06e4858602753c10139ad38f812f6c5aeb8146"
 }