mooho-base-admin-plus 2.8.6 → 2.8.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.8.6",
+  "version": "2.8.8",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,
@@ -20,6 +20,7 @@
     "echarts": "^5.3.2",
     "file-saver": "^2.0.2",
     "js-cookie": "^3.0.1",
+    "jsencrypt": "^3.3.2",
     "lodash": "^4.17.21",
     "lowdb": "^1.0.0",
     "screenfull": "^4.2.1",

package/src/api/user.js

@@ -1,4 +1,5 @@
 import request from '../libs/request';
+import encrypt from '../libs/encrypt';
 
 const res = 'User';
 
@@ -13,6 +14,7 @@ export default {
     });
   },
   login(data) {
+    data.password = encrypt(data.password);
     return request({
       url: `api/${res}/login`,
       method: 'post',
@@ -29,6 +31,8 @@ export default {
     });
   },
   updatePassword(data) {
+    data.oldPassword = encrypt(data.oldPassword);
+    data.newPassword = encrypt(data.newPassword);
     return request({
       url: `api/${res}/updatePassword`,
       method: 'post',

package/src/components/upload/upload-attachment.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <Upload
+      ref="upload"
       :action="uploadAction"
       :headers="uploadHeaders"
       :default-file-list="defaultList"
@@ -133,6 +134,12 @@
       },
       // 上传成功
       onUploadSuccess(res, file) {
+        if (res.code != 0) {
+          this.error(res.message);
+          this.$refs.upload.fileList = this.$refs.upload.fileList.filter(item => item.uid != file.uid);
+          return false;
+        }
+
         let list = this.fileList;
 
         list.push({

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

@@ -473,9 +473,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 

package/src/components/view/view-form-draggable.vue

@@ -647,9 +647,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 
@@ -1054,102 +1054,6 @@
             item.needClear = true;
           });
         }
-      },
-      // 根据表达式取值(可筛选选择框)
-      parseComboData(model, column) {
-        let value = this.parseData(model, column.code);
-
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, value);
-        });
-
-        return value;
-      },
-      // 根据表达式取值(可筛选多选选择框)
-      parseMultiComboData(model, column) {
-        let data = [];
-        let value = this.parseData(model, column.code);
-
-        if (this.isJSON(value)) {
-          data = JSON.parse(value);
-        }
-
-        this.loadComboDataLabel(model, column, data);
-
-        return data;
-      },
-      // 加载可筛选选择框显示内容
-      async loadComboDataLabel(model, column, data) {
-        if (column.isStaticItem || (column.dataType && column.dataType.startsWith('Enum:'))) {
-          return;
-        }
-
-        if (this.$refs['control_' + column.code] && data) {
-          let values;
-          if (Array.isArray(this.$refs['control_' + column.code])) {
-            values = this.$refs['control_' + column.code][0].$data.values;
-          } else {
-            values = this.$refs['control_' + column.code].$data.values;
-          }
-
-          let pendings = [];
-          if (column.controlType == 'MultiComboSelect') {
-            data.forEach(value => {
-              if (!values.some(v => v.value == value)) {
-                // 不在选中项中
-                let newValue = { value, label: null, disabled: false };
-                values.push(newValue);
-                pendings.push(newValue);
-              }
-            });
-          } else {
-            if (!values.some(v => v.value == data)) {
-              // 不在选中项中
-              let newValue = { value: data, label: null, disabled: false };
-              values.push(newValue);
-              pendings.push(newValue);
-            }
-          }
-
-          // 读取显示内容
-          setTimeout(async () => {
-            if (pendings.length > 0) {
-              let param = this.getParam(model, column);
-              param[column.sourceDataCode] = pendings.map(item => item.value).join(',');
-              let res;
-
-              if (column.isSourceCustom) {
-                res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-              } else {
-                res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-              }
-
-              res.data.forEach(item => {
-                let v = this.parseData(item, column.sourceDataCode);
-                let label = this.parseData(item, column.sourceDisplayCode);
-
-                if (column.controlType == 'ComboSelect') {
-                  // 添加筛选内容
-                  //this.$refs['control_' + column.code][0].$data.query = label;
-                }
-
-                let newValue = pendings.find(i => i.value == v);
-
-                if (newValue) {
-                  newValue.label = label;
-                }
-              });
-
-              this.$forceUpdate();
-            }
-          });
-        }
-      },
-      // 可筛选下拉框搜索条件变化
-      onComboQueryChange(column, query) {
-        if (!(query || '').trim()) {
-          this.loadOption(this.data, column, null);
-        }
       }
     }
   };

package/src/components/view/view-form.vue

@@ -1166,9 +1166,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 

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

@@ -1962,9 +1962,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 
@@ -2836,93 +2836,6 @@
             item.needClear = true;
           });
         }
-      },
-      // 根据表达式取值(可筛选选择框)
-      parseComboData(model, column, index) {
-        let value = this.parseData(model, column.code);
-
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, value, index);
-        });
-
-        return value;
-      },
-      // 根据表达式取值(可筛选多选选择框)
-      parseMultiComboData(model, column, index) {
-        let data = [];
-        let value = this.parseData(model, column.code);
-
-        if (this.isJSON(value)) {
-          data = JSON.parse(value);
-        }
-
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, data, index);
-        });
-
-        return data;
-      },
-      // 加载可筛选选择框显示内容
-      async loadComboDataLabel(model, column, data, index) {
-        if (column.isStaticItem || (column.dataType && column.dataType.startsWith('Enum:'))) {
-          return;
-        }
-
-        // 取不到ref对象，无法给values赋值。所以可筛选选择框控件在table中暂时不可用
-        if (this.$refs['control_' + column.code + '_' + index] && data) {
-          let values = this.$refs['control_' + column.code + '_' + index].$data.values;
-
-          let pendings = [];
-          if (column.controlType == 'MultiComboSelect') {
-            data.forEach(value => {
-              if (!values.some(v => v.value == value)) {
-                // 不在选中项中
-                let newValue = { value, label: null, disabled: false };
-                values.push(newValue);
-                pendings.push(newValue);
-              }
-            });
-          } else {
-            if (!values.some(v => v.value == data)) {
-              // 不在选中项中
-              let newValue = { value: data, label: null, disabled: false };
-              values.push(newValue);
-              pendings.push(newValue);
-            }
-          }
-
-          // 读取显示内容
-          if (pendings.length > 0) {
-            let param = this.getParam(model, column);
-            param[column.sourceDataCode] = pendings.map(item => item.value).join(',');
-            let res;
-
-            if (column.isSourceCustom) {
-              res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-            } else {
-              res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-            }
-
-            res.data.forEach(item => {
-              let v = this.parseData(item, column.sourceDataCode);
-              let label = this.parseData(item, column.sourceDisplayCode);
-
-              if (column.controlType == 'ComboSelect') {
-                // 添加筛选内容
-                //this.$refs['control_' + column.code + '_' + index].$data.query = label;
-                //this.$refs['control_' + column.code + '_' + index].setQuery(label);
-              }
-
-              let newValue = pendings.find(i => i.value == v);
-
-              if (newValue) {
-                newValue.label = label;
-              }
-
-              this.$forceUpdate();
-            });
-          }
-        }
       }
     }
   };

package/src/libs/encrypt.js

@@ -0,0 +1,12 @@
+import JSEncrypt from 'jsencrypt';
+import setting from '../setting';
+
+// 使用生成的密钥对进行加密
+const encryptor = new JSEncrypt();
+encryptor.setPublicKey(setting.encrypt.publicKey);
+
+export default str => {
+  let encrypted = encryptor.encrypt(str);
+
+  return encrypted;
+};

package/src/setting.js

@@ -175,6 +175,18 @@ const Setting = {
     // 水印配置
     options: {}
   },
+  /**
+   * 加密配置
+   * */
+  encrypt: {
+    // 公钥
+    publicKey: `-----BEGIN PUBLIC KEY-----
+    MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6q617CxtIUoK2qzxUFDpzpLnx
+    3UfwD1VfF5+ZZY1zDtd/CljGIbXvqyjeeAfSvnMYHMWrwakHFOev6W1+rW4Zt6UD
+    A2a/DmlGjIJfxXnX95Gp4hX/aBV12RTS2QYdVjoxHep/m3q7+JXD5fleLp2yvdCF
+    F5CPyToId81c4cawpQIDAQAB
+    -----END PUBLIC KEY-----`
+  },
   /**
    * 功能配置
    * */