mooho-base-admin-plus 2.7.4 → 2.7.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.7.4",
+  "version": "2.7.6",
   "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/layouts/basic-layout/header-notice/index.vue

@@ -55,7 +55,7 @@
         </NotificationTab>
       </Notification>
     </span>
-    <task-form ref="taskForm"></task-form>
+    <task-form ref="taskForm" @on-after-action="reload()"></task-form>
     <modal-form ref="notificationForm" view-code="NotificationView" :save-enable="false"></modal-form>
   </div>
 </template>
@@ -203,6 +203,9 @@
         this.taskFilter.page = 0;
         this.loadMore('task');
       },
+      reload() {
+        location.reload();
+      },
       openNotification(item) {
         if (!item.isRead) {
           this.unreadCount--;

package/src/pages/common/todo.vue

@@ -6,7 +6,7 @@
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Tabs value="todo">
         <TabPane :label="$t('Front_Label_Todo')" name="todo">
-          <view-table ref="table" view-code="TodoList" :select-enable="true">
+          <view-table ref="todoTable" view-code="TodoList" :select-enable="true">
             <template #filterCommand>
               <Button size="small" type="primary" custom-icon="fa fa-check-double" @click="batchDo">{{ $t('Front_Btn_Batch_Do') }}</Button>
             </template>
@@ -16,7 +16,7 @@
           </view-table>
         </TabPane>
         <TabPane :label="$t('Front_Label_Done')" name="done">
-          <view-table ref="table" view-code="DoneList">
+          <view-table ref="doneTable" view-code="DoneList">
             <template #command="{ row }">
               <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
             </template>
@@ -24,7 +24,7 @@
         </TabPane>
       </Tabs>
     </Card>
-    <task-form ref="taskForm" @on-after-action="$refs.table.loadData()"></task-form>
+    <task-form ref="taskForm" @on-after-action="onAfterAction()"></task-form>
   </div>
 </template>
 <script>
@@ -55,18 +55,23 @@
     methods: {
       batchDo() {
         this.confirm('Front_Msg_Sure_To_Batch_Do', async () => {
-          let ids = this.$refs.table.getSelected().map(x => {
+          let ids = this.$refs.todoTable.getSelected().map(x => {
             return x.id;
           });
 
           if (ids.length > 0) {
             await taskApi.batchDo(ids);
             this.success('Front_Msg_Success');
-            this.$refs.table.loadData();
+            this.$refs.todoTable.loadData();
+            this.$refs.doneTable.loadData();
           } else {
             this.error('Front_Msg_Please_Select_Task_Item');
           }
         });
+      },
+      onAfterAction() {
+        this.$refs.todoTable.loadData();
+        this.$refs.doneTable.loadData();
       }
     }
   };