mooho-base-admin-plus 2.10.62 → 2.10.64

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.62",
+  "version": "2.10.64",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/public/setting.js

@@ -96,5 +96,12 @@ window.setting = {
     auto: true,
     // 切换语言时是否刷新页面
     refresh: true
+  },
+  /**
+   * 加密配置
+   * */
+  encrypt: {
+    // 是否开启密码加密，开启后，登录、修改密码等操作，都需要进行密码加密处理
+    passwordEncrypt: false
   }
 };

package/src/api/user.js

@@ -1,5 +1,6 @@
 import request from '../libs/request';
 import encrypt from '../libs/encrypt';
+import Setting from '../setting.js';
 
 const res = 'User';
 
@@ -14,7 +15,10 @@ export default {
     });
   },
   login(data) {
-    data.password = encrypt(data.password);
+    if (Setting.encrypt.passwordEncrypt) {
+      data.password = encrypt(data.password);
+    }
+
     return request({
       url: `api/${res}/login`,
       method: 'post',
@@ -31,8 +35,11 @@ export default {
     });
   },
   updatePassword(data) {
-    data.oldPassword = encrypt(data.oldPassword);
-    data.newPassword = encrypt(data.newPassword);
+    if (Setting.encrypt.passwordEncrypt) {
+      data.oldPassword = encrypt(data.oldPassword);
+      data.newPassword = encrypt(data.newPassword);
+    }
+
     return request({
       url: `api/${res}/updatePassword`,
       method: 'post',

package/src/components/view/mixin.js

@@ -111,6 +111,7 @@ export default {
           if (item.defaultValue.startsWith('{today}')) {
             // 当前日期
             let date = new Date();
+            date.setHours(0, 0, 0, 0);
 
             if (item.defaultValue.indexOf('+') != -1) {
               date.setDate(date.getDate() + parseInt(item.defaultValue.split('+')[1]));
@@ -118,11 +119,27 @@ export default {
               date.setDate(date.getDate() - parseInt(item.defaultValue.split('-')[1]));
             }
 
-            let value = date.toISOString().replace(/T.*/, '');
-            setData(data, item, new Date(value));
+            let format = 'yyyy-MM-dd HH:mm:ss';
+
+            if (item.controlType == 'Date') {
+              format = 'yyyy-MM-dd';
+            } else if (item.controlType == 'Time') {
+              format = 'HH:mm:ss';
+            } else if (item.controlType == 'DateTime') {
+              format = 'yyyy-MM-dd HH:mm:ss';
+            } else if (item.controlType == 'Year') {
+              format = 'yyyy';
+            } else if (item.controlType == 'Month') {
+              format = 'yyyy-MM';
+            } else {
+              format = 'yyyy-MM-dd';
+            }
+
+            setData(data, item, dateFormat(date, format));
           } else if (item.defaultValue.startsWith('{today(')) {
             // 当前日期
             let date = new Date();
+            date.setHours(0, 0, 0, 0);
 
             if (item.defaultValue.indexOf('+') != -1) {
               date.setDate(date.getDate() + parseInt(item.defaultValue.split('+')[1]));

package/src/components/view/table-filter.vue

@@ -290,7 +290,6 @@
   import modelApi from '../../api/model';
   import customModelApi from '../../api/customModel';
   import DialogSelect from '../input/dialog-select.vue';
-  import dateFormat from 'date-fns/format';
 
   export default {
     mixins: [mixin, mixinPage],

package/src/setting.js

@@ -189,6 +189,8 @@ const Setting = {
    * 加密配置
    * */
   encrypt: {
+    // 是否开启密码加密，开启后，登录、修改密码等操作，都需要进行密码加密处理
+    passwordEncrypt: true,
     // 公钥
     publicKey: `-----BEGIN PUBLIC KEY-----
     MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6q617CxtIUoK2qzxUFDpzpLnx