mooho-base-admin-plus 2.7.1 → 2.7.5

package/package.json

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

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

@@ -69,7 +69,7 @@
               <Divider :plain="true" dashed orientation="left" size="small">
                 <span class="title">{{ getNameI18n(column) }}</span>
               </Divider>
-              <view-table :ref="'list_' + column.code" :static="true" :view-code="column.source" :readonly="true" :embedded="true"></view-table>
+              <view-table :ref="'list_' + column.code" :view-code="column.source" :readonly="true" :auto-load="false"></view-table>
             </div>
             <FormItem
               :label="getNameI18n(column)"
@@ -1527,13 +1527,11 @@
                   };
                 }
 
-                if (column.isSourceCustom) {
-                  res = await customModelApi.query(column.sourceModel, param);
-                } else {
-                  res = await modelApi.query(column.sourceModel, param, tableView.functionName, tableView.functionType);
+                for (let key in param) {
+                  this.$refs['list_' + column.code][0].filterData[key] = param[key];
                 }
 
-                this.$refs['list_' + column.code][0].loadData(res.data);
+                this.$refs['list_' + column.code][0].loadData();
               }
             }
           }

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

@@ -2207,11 +2207,13 @@
       onSelectAll(selection) {
         // 当页所有数据
         let allData = this.getDataWithChildren(this.data);
-        this.selectedData.length = 0;
 
         allData.forEach(item => {
           item._checked = true;
-          this.selectedData.push(item);
+
+          if (!this.selectedData.some(i => i.id == item.id)) {
+            this.selectedData.push(item);
+          }
         });
 
         /**
@@ -2225,9 +2227,12 @@
 
         allData.forEach(item => {
           item._checked = false;
-        });
 
-        this.selectedData.length = 0;
+          if (this.selectedData.some(i => i.id == item.id)) {
+            const index = this.selectedData.findIndex(i => i.id === item.id);
+            this.selectedData.splice(index, 1);
+          }
+        });
 
         /**
          * 选中项变化事件

package/src/mixins/page.js

@@ -485,7 +485,7 @@ export default {
       let expression = '';
 
       for (let i = 0; i < text.length; i++) {
-        if (
+        const operator =
           text[i] == ' ' ||
           text[i] == '+' ||
           text[i] == '-' ||
@@ -498,10 +498,10 @@ export default {
           text[i] == '!' ||
           text[i] == '|' ||
           text[i] == '&' ||
-          text[i] == '=' ||
-          i == text.length - 1
-        ) {
-          if (i == text.length - 1) {
+          text[i] == '=';
+
+        if (operator || i == text.length - 1) {
+          if (!operator) {
             expression += text[i];
           }
 
@@ -525,7 +525,7 @@ export default {
             expression = '';
           }
 
-          if (i != text.length - 1) {
+          if (operator) {
             result += text[i];
           }
         } else {