From a55d22468017679f4503c1f4c5f595300e8d2f34 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 27 十一月 2024 23:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/util/func.js | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/util/func.js b/Source/plt-web/plt-web-ui/src/util/func.js
index 03c02d3..19783ca 100644
--- a/Source/plt-web/plt-web-ui/src/util/func.js
+++ b/Source/plt-web/plt-web-ui/src/util/func.js
@@ -4,6 +4,28 @@
import CryptoJS from 'crypto-js'
export default class func {
+ /**
+ * 鍗曢�夎〃鏍艰
+ * 鏃堕棿鎴虫牸寮忓寲
+ */
+ static formattedDate(val) {
+ // 鍒涘缓涓�涓� Date 瀵硅薄
+ const date = new Date(val);
+
+ // 鏍煎紡鍖栨椂闂寸殑杈呭姪鍑芥暟
+ const formatNumber = (number) => String(number).padStart(2, '0');
+
+ // 鎻愬彇骞舵牸寮忓寲骞淬�佹湀銆佹棩銆佸皬鏃躲�佸垎閽熷拰绉�
+ const year = date.getFullYear();
+ const month = formatNumber(date.getMonth() + 1); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕�+1
+ const day = formatNumber(date.getDate());
+ const hours = formatNumber(date.getHours());
+ const minutes = formatNumber(date.getMinutes());
+ const seconds = formatNumber(date.getSeconds());
+
+ // 鏍煎紡鍖栦负 YYYY-MM-DD HH:MM:SS
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ }
/**
* 鍗曢�夎〃鏍艰
@@ -15,15 +37,17 @@
*/
static rowClickHandler(row, CrudRef, lastIndex, setLastIndex, setSelectList) {
- if (lastIndex === row.$index) {
+ /*if (lastIndex === row.$index) {
setSelectList();
CrudRef.clearSelection();
} else {
setSelectList();
CrudRef.clearSelection();
CrudRef.toggleRowSelection(row);
- }
-
+ }*/
+ setSelectList();
+ CrudRef.toggleSelection();
+ CrudRef.toggleRowSelection(row);//閫変腑褰撳墠琛�
setLastIndex(row.$index);
}
@@ -68,7 +92,11 @@
*/
static isEmptyObject(obj) {
- return Object.keys(obj).length === 0;
+ if(obj){
+ return Object.keys(obj).length === 0;
+ }else {
+ return true;
+ }
}
/**
@@ -223,7 +251,7 @@
padding: CryptoJS.pad.Pkcs7
});
return encrypted.toString();
-}
+ }
/**
* HmacMD5鍔犲瘑
@@ -233,7 +261,7 @@
* @constructor
*/
static HmacMD5(message, key) {
- const encrypted = CryptoJS.HmacMD5(message,key);
+ const encrypted = CryptoJS.HmacMD5(message, key);
return encrypted.toString();
}
--
Gitblit v1.9.3