mooho-base-admin-plus 2.4.47 → 2.4.49

package/package.json

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

package/src/components/input/dialog-select.vue

@@ -225,7 +225,7 @@
             this.loadDataEnable = false;
           }
 
-          this.$refs.dialogTable.loadData();
+          //this.$refs.dialogTable.loadData();
 
           setTimeout(async () => {
             if (this.multi) {

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

@@ -737,6 +737,9 @@
           case 'Year':
             key = 'y_' + key; // 年
             break;
+          case 'DateRange':
+            key = key + '_c'; // 日期范围
+            return key;
         }
         //}
 
@@ -757,7 +760,7 @@
             key = key + '_n'; // 不等于
             break;
           case 'Contains':
-            key = key + '_c'; // 模糊匹配
+            key = key + '_c'; // 文字包含
             break;
         }
 

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

@@ -732,7 +732,7 @@
       },
       // 获取数据源
       getDataSource(data, column) {
-        if (!column.isStaticItem && column.dataType && column.dataType.startsWith('Enum:')) {
+        if (!column.isStaticItem && column.dataType.startsWith('Enum:')) {
           // 枚举
           return this.getEnumList(column.dataType.split(':')[1]);
         } else {
@@ -742,17 +742,22 @@
       // 数据变化事件
       async onDataChange(sender) {
         // 计算需要刷新的字段
-        if (sender == null || sender.triggers !== []) {
+        if (sender == null || (sender.triggers && sender.triggers !== [])) {
           this.columns.forEach(function (column) {
             if (
+              !column.isStaticItem &&
               !!(column.source || '').trim() &&
               !(column.dataType && column.dataType.startsWith('Enum:')) &&
               (sender == null ||
                 sender.triggers.some(item => {
-                  return item.id === column.id;
+                  return item.code == column.code;
                 }))
             ) {
               column.needRefresh = true;
+              // if (column.controlType == 'Table') {
+              //     this.$refs['table_' + sender.code][0];
+              // } else {
+              // }
             }
           });
         }

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

@@ -2147,8 +2147,11 @@
 
         for (let key in filter) {
           if (this.isJSON(filter[key])) {
-            // 数组转换为逗号分隔的字符串
+            // JSON数组，转换为逗号分隔的字符串
             filter[key] = JSON.parse(filter[key]).join(',');
+          } else if (Object.prototype.toString.call(filter[key]) === '[object Array]') {
+            // 数组转换为逗号分隔的字符串
+            filter[key] = filter[key].join(',');
           } else if (typeof filter[key] == 'object' && !(filter[key] instanceof Date)) {
             delete filter[key];
           }

package/src/layouts/basic-layout/index.vue

@@ -280,7 +280,6 @@
       document.addEventListener('scroll', this.handleScroll, { passive: true });
 
       // 非移动端，根据系统缩放比率调整界面大小
-      //console.log('navigator.userAgent', navigator.userAgent);
       if (
         Setting.layout.autoFixRatio == true &&
         window.screen.width < 1920 &&

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

@@ -244,7 +244,6 @@ export default {
       // 设置侧边栏菜单
       const menuSiderList = getNativeMenuSider();
 
-      //console.log('setMenuList', to, to.matched, to.matched.length);
       //let path = to.matched[to.matched.length - 1].path;
 
       //let headerName = getHeaderName(path, menuSiderList);