mooho-base-admin-plus 2.4.40 → 2.4.42

package/package.json

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

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

@@ -157,6 +157,8 @@
               :placeholder="column.description"
               :transfer="true"
               @on-change="selected => onSelectDataChange(column, selected)"
+              @on-query-change="query => onComboQueryChange(column, query)"
+              @on-clear="loadOption(data, column, null)"
             >
               <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
             </Select>
@@ -177,6 +179,7 @@
               :placeholder="column.description"
               :transfer="true"
               @on-change="selected => onSelectDataChange(column, selected)"
+              @on-query-change="query => onComboQueryChange(column, query)"
             >
               <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
             </Select>
@@ -565,31 +568,6 @@
           return column.dataSource == null ? [] : column.dataSource;
         }
       },
-      // // 可筛选下拉框加载数据
-      // loadOption(data, column, keyword) {
-      //     let param = this.getParam(data, column);
-
-      //     if (param != null) {
-      //         if (!(keyword || '').trim() && this.parseFilterData(data, column) != null) {
-      //             param.id = this.parseFilterData(data, column);
-      //         } else {
-      //             param.keyword = keyword;
-      //         }
-      //         param.per = 20;
-
-      //         this.fillDataSource(data, column, param);
-      //     } else {
-      //         // 参数不完整，清空数据
-      //         column.dataSource = [];
-      //         this.setData(data, column.code, null);
-      //         // column.displayValue = null;
-
-      //         // 触发
-      //         column.triggers.forEach(item => {
-      //             item.needRefresh = true;
-      //         });
-      //     }
-      // },
       // 选项变化事件
       onSelectDataChange(sender, selected) {
         let code;
@@ -879,9 +857,7 @@
           data = JSON.parse(value);
         }
 
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, data);
-        });
+        this.loadComboDataLabel(model, column, data);
 
         return data;
       },
@@ -914,35 +890,43 @@
           }
 
           // 读取显示内容
-          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);
-            } else {
-              res = await modelApi.query(column.source, param);
-            }
+          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);
+              } else {
+                res = await modelApi.query(column.source, param);
+              }
 
-            res.data.forEach(item => {
-              let v = this.parseData(item, column.sourceDataCode);
-              let label = this.parseData(item, 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;
-              }
+                if (column.controlType == 'ComboSelect') {
+                  // 添加筛选内容
+                  //this.$refs['control_' + column.code][0].$data.query = label;
+                }
 
-              let newValue = pendings.find(i => i.value == v);
+                let newValue = pendings.find(i => i.value == v);
 
-              if (newValue) {
-                newValue.label = label;
-              }
-            });
+                if (newValue) {
+                  newValue.label = label;
+                }
+              });
 
-            this.$forceUpdate();
-          }
+              this.$forceUpdate();
+            }
+          });
+        }
+      },
+      // 可筛选下拉框搜索条件变化
+      onComboQueryChange(column, query) {
+        if (!(query || '').trim()) {
+          this.loadOption(this.data, column, null);
         }
       }
     }

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

@@ -200,6 +200,8 @@
                   :placeholder="column.description"
                   :transfer="true"
                   @on-change="selected => onSelectDataChange(column, selected)"
+                  @on-query-change="query => onComboQueryChange(column, query)"
+                  @on-clear="loadOption(data, column, null)"
                 >
                   <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
                 </Select>
@@ -218,6 +220,7 @@
                   :placeholder="column.description"
                   :transfer="true"
                   @on-change="selected => onSelectDataChange(column, selected)"
+                  @on-query-change="query => onComboQueryChange(column, query)"
                 >
                   <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
                 </Select>
@@ -1085,9 +1088,7 @@
           data = JSON.parse(value);
         }
 
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, data);
-        });
+        this.loadComboDataLabel(model, column, data);
 
         return data;
       },
@@ -1125,35 +1126,43 @@
           }
 
           // 读取显示内容
-          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);
-            } else {
-              res = await modelApi.query(column.source, param);
-            }
+          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);
+              } else {
+                res = await modelApi.query(column.source, param);
+              }
 
-            res.data.forEach(item => {
-              let v = this.parseData(item, column.sourceDataCode);
-              let label = this.parseData(item, 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;
-              }
+                if (column.controlType == 'ComboSelect') {
+                  // 添加筛选内容
+                  //this.$refs['control_' + column.code][0].$data.query = label;
+                }
 
-              let newValue = pendings.find(i => i.value == v);
+                let newValue = pendings.find(i => i.value == v);
 
-              if (newValue) {
-                newValue.label = label;
-              }
-            });
+                if (newValue) {
+                  newValue.label = label;
+                }
+              });
 
-            this.$forceUpdate();
-          }
+              this.$forceUpdate();
+            }
+          });
+        }
+      },
+      // 可筛选下拉框搜索条件变化
+      onComboQueryChange(column, query) {
+        if (!(query || '').trim()) {
+          this.loadOption(this.data, column, null);
         }
       }
     }

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

@@ -219,6 +219,8 @@
                   :placeholder="column.description"
                   :transfer="true"
                   @on-change="selected => onSelectDataChange(column, selected)"
+                  @on-query-change="query => onComboQueryChange(column, query)"
+                  @on-clear="loadOption(data, column, null)"
                 >
                   <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
                 </Select>
@@ -1647,9 +1649,7 @@
           data = JSON.parse(value);
         }
 
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, data);
-        });
+        this.loadComboDataLabel(model, column, data);
 
         return data;
       },
@@ -1660,7 +1660,7 @@
         }
 
         if (this.$refs['control_' + column.code] && data) {
-          let values = this.$refs['control_' + column.code][0].$data.values;
+          let values = this.$refs['control_' + column.code][0].values;
 
           let pendings = [];
           if (column.controlType == 'MultiComboSelect') {
@@ -1668,7 +1668,7 @@
               if (!values.some(v => v.value == value)) {
                 // 不在选中项中
                 let newValue = { value, label: null, disabled: false };
-                values.push(newValue);
+                this.$refs['control_' + column.code][0].values.push(newValue);
                 pendings.push(newValue);
               }
             });
@@ -1682,35 +1682,43 @@
           }
 
           // 读取显示内容
-          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);
-            } else {
-              res = await modelApi.query(column.source, param);
-            }
+          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);
+              } else {
+                res = await modelApi.query(column.source, param);
+              }
 
-            res.data.forEach(item => {
-              let v = this.parseData(item, column.sourceDataCode);
-              let label = this.parseData(item, 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;
-              }
+                if (column.controlType == 'ComboSelect') {
+                  // 添加筛选内容
+                  //this.$refs['control_' + column.code][0].$data.query = label;
+                }
 
-              let newValue = pendings.find(i => i.value == v);
+                let newValue = pendings.find(i => i.value == v);
 
-              if (newValue) {
-                newValue.label = label;
-              }
-            });
+                if (newValue) {
+                  newValue.label = label;
+                }
+              });
 
-            this.$forceUpdate();
-          }
+              this.$forceUpdate();
+            }
+          });
+        }
+      },
+      // 可筛选下拉框搜索条件变化
+      onComboQueryChange(column, query) {
+        if (!(query || '').trim()) {
+          this.loadOption(this.data, column, null);
         }
       }
     }

package/src/mixins/page.js

@@ -110,7 +110,7 @@ export default {
         return this.userPermissions[key];
       } else {
         // 页面权限点
-        let url = router.currentRoute.value.fullPath.substr(1);
+        let url = router.currentRoute.value.fullPath.substr(1).split('?')[0];
 
         if (this.userPermissions[url + '$' + key] == true) {
           return true;
@@ -413,7 +413,6 @@ export default {
     },
     // 根据表达式赋值(数组)
     setArrayData(model, expression, value) {
-      console.log('setArrayData', expression, value);
       let data = '';
       if (value != null) {
         data = JSON.stringify(value);

package/src/store/modules/admin/modules/menu.js

@@ -301,13 +301,7 @@ export default {
 
             let permissions = {};
             res.permissions.forEach(key => {
-              let permissionKey = key.split('?')[0];
-
-              if (key.split('$').length > 1) {
-                permissionKey = permissionKey + '$' + key.split('$')[1];
-              }
-
-              permissions[permissionKey] = true;
+              permissions[key.split('?')[0]] = true;
             });
 
             state.userPermissions = permissions;

package/src/styles/css/default.css

@@ -52,7 +52,7 @@
 }
 
 .i-layout-page-header {
-  margin-bottom: -80px;
+  margin: 0px -12px -80px -12px;
 }
 
 .i-layout-content-main {