mooho-base-admin-plus 2.10.62 → 2.10.64

package/history.md

@@ -233,3 +233,5 @@ mooho-base-admin-plus@2.10.59 - 修复Excel表格右键菜单的bug
 mooho-base-admin-plus@2.10.60 - 修复表格冻结列时没有冻结序号、Excel表格可显示隐藏序号
 mooho-base-admin-plus@2.10.61 - Excel表格增加动态显示
 mooho-base-admin-plus@2.10.62 - 显示流程图、日期默认值增加加减日期
+mooho-base-admin-plus@2.10.63 - 增加密码传输加密开关
+mooho-base-admin-plus@2.10.64 - 修复默认日期的bug

package/package/mooho-base-admin-plus.min.esm.js

@@ -4775,6 +4775,8 @@ const Setting = {
    * 加密配置
    * */
   encrypt: {
+    // 是否开启密码加密，开启后，登录、修改密码等操作，都需要进行密码加密处理
+    passwordEncrypt: !0,
     // 公钥
     publicKey: `-----BEGIN PUBLIC KEY-----
     MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6q617CxtIUoK2qzxUFDpzpLnx
@@ -11834,7 +11836,7 @@ const encrypt = (a) => encryptor.encrypt(a), res$o = "User", userlApi = {
     });
   },
   login(a) {
-    return a.password = encrypt(a.password), service({
+    return Setting.encrypt.passwordEncrypt && (a.password = encrypt(a.password)), service({
       url: `api/${res$o}/login`,
       method: "post",
       data: a
@@ -11850,7 +11852,7 @@ const encrypt = (a) => encryptor.encrypt(a), res$o = "User", userlApi = {
     });
   },
   updatePassword(a) {
-    return a.oldPassword = encrypt(a.oldPassword), a.newPassword = encrypt(a.newPassword), service({
+    return Setting.encrypt.passwordEncrypt && (a.oldPassword = encrypt(a.oldPassword), a.newPassword = encrypt(a.newPassword)), service({
       url: `api/${res$o}/updatePassword`,
       method: "post",
       data: a
@@ -33414,12 +33416,12 @@ const columnEdit = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["render", _sfc_ren
         if (s.defaultValue)
           if (s.defaultValue.startsWith("{today}")) {
             let l = /* @__PURE__ */ new Date();
-            s.defaultValue.indexOf("+") != -1 ? l.setDate(l.getDate() + parseInt(s.defaultValue.split("+")[1])) : s.defaultValue.indexOf("-") != -1 && l.setDate(l.getDate() - parseInt(s.defaultValue.split("-")[1]));
-            let c = l.toISOString().replace(/T.*/, "");
-            a(o, s, new Date(c));
+            l.setHours(0, 0, 0, 0), s.defaultValue.indexOf("+") != -1 ? l.setDate(l.getDate() + parseInt(s.defaultValue.split("+")[1])) : s.defaultValue.indexOf("-") != -1 && l.setDate(l.getDate() - parseInt(s.defaultValue.split("-")[1]));
+            let c = "yyyy-MM-dd HH:mm:ss";
+            s.controlType == "Date" ? c = "yyyy-MM-dd" : s.controlType == "Time" ? c = "HH:mm:ss" : s.controlType == "DateTime" ? c = "yyyy-MM-dd HH:mm:ss" : s.controlType == "Year" ? c = "yyyy" : s.controlType == "Month" ? c = "yyyy-MM" : c = "yyyy-MM-dd", a(o, s, format$6(l, c));
           } else if (s.defaultValue.startsWith("{today(")) {
             let l = /* @__PURE__ */ new Date();
-            s.defaultValue.indexOf("+") != -1 ? l.setDate(l.getDate() + parseInt(s.defaultValue.split("+")[1])) : s.defaultValue.indexOf("-") != -1 && l.setDate(l.getDate() - parseInt(s.defaultValue.split("-")[1]));
+            l.setHours(0, 0, 0, 0), s.defaultValue.indexOf("+") != -1 ? l.setDate(l.getDate() + parseInt(s.defaultValue.split("+")[1])) : s.defaultValue.indexOf("-") != -1 && l.setDate(l.getDate() - parseInt(s.defaultValue.split("-")[1]));
             let c = s.defaultValue.substr(7, s.defaultValue.indexOf(")}") - 7);
             a(o, s, format$6(l, c));
           } else s.defaultValue == "{currentUserID}" ? a(o, s, this.info.id) : s.defaultValue == "{currentUser}" ? a(o, s, this.info.name) : s.controlType == "MultiSelect" || s.controlType == "MultiTreeSelect" || s.controlType == "MultiComboSelect" ? r(o, s, s.defaultValue.split(",")) : s.dataType === "Integer" ? a(o, s, parseInt(s.defaultValue)) : s.dataType === "Decimal" ? a(o, s, parseFloat(s.defaultValue)) : s.dataType === "Boolean" && s.defaultValue.toUpperCase == "TRUE" ? a(o, s, !0) : s.dataType === "Boolean" && s.defaultValue.toUpperCase == "FALSE" ? a(o, s, !1) : a(o, s, s.defaultValue);