mooho-base-admin-plus 2.7.7 → 2.8.0

package/package.json

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

package/public/setting.js

@@ -66,7 +66,7 @@ window.setting = {
     // 全局面包屑是否显示图标，开启 showBreadcrumb 时有效
     showBreadcrumbIcon: false,
     // 是否显示多语言
-    showI18n: true,
+    showI18n: false,
     // 是否支持动态修改布局配置，移动端下会自动强制关闭
     enableSetting: false,
     // 退出登录时，是否二次确认

package/src/api/customModel.js

@@ -56,21 +56,26 @@ export default {
       }
     });
   },
-  query(modelName, filter) {
+  query(modelName, filter, columns, tableView) {
     let path = filter.isGroupBy ? 'group' : 'query';
+
+    let data = {
+      modelName,
+      ...filter,
+      columns,
+      viewCode: tableView ? tableView.code : null
+    };
+
     return request({
       url: `api/${res}/${path}`,
       method: 'post',
-      data: {
-        ...filter,
-        modelName
-      }
+      data
     });
   },
   async exportExcel(tableView, filter) {
     let data = {
-      ...filter,
       modelName: tableView.model,
+      ...filter,
       per: tableView.maxExportCount == null ? 1000000 : tableView.maxExportCount,
       returnType: 1,
       viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
@@ -104,8 +109,8 @@ export default {
   },
   async exportPdf(tableView, filter) {
     let data = {
-      ...filter,
       modelName: tableView.model,
+      ...filter,
       per: 100000,
       returnType: 3,
       viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code

package/src/api/dataSource.js

@@ -7,22 +7,24 @@ const res = 'DataSource';
 
 export default {
   query(dataSource, filter) {
+    let data = {
+      dataSource,
+      ...filter
+    };
+
     return request({
       url: `api/${res}/query`,
       method: 'post',
-      data: {
-        ...filter,
-        dataSource
-      }
+      data
     });
   },
   async exportExcel(tableView, filter, path = 'query') {
     let data = {
+      dataSource: tableView.dataSource,
       ...filter,
       per: tableView.maxExportCount == null ? 1000000 : tableView.maxExportCount,
       returnType: 1,
-      viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code,
-      dataSource: tableView.dataSource
+      viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
     };
 
     const result = await request({
@@ -39,11 +41,11 @@ export default {
   },
   async exportPdf(tableView, filter, path = 'query') {
     let data = {
+      dataSource: tableView.dataSource,
       ...filter,
       per: 100000,
       returnType: 3,
-      viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code,
-      dataSource: tableView.dataSource
+      viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
     };
 
     const result = await request({

package/src/api/model.js

@@ -60,7 +60,7 @@ export default {
       }
     });
   },
-  query(res, filter, path, method) {
+  query(res, filter, columns, tableView, path, method) {
     if (path == null || path == '') {
       path = 'query';
     }
@@ -69,19 +69,25 @@ export default {
       method = 'post';
     }
 
+    let data = {
+      ...filter,
+      columns,
+      viewCode: tableView ? tableView.code : null
+    };
+
     if (filter.isGroupBy) {
-      filter.modelName = res;
+      data.modelName = res;
 
       return request({
         url: `api/Model/group`,
         method: 'post',
-        data: filter
+        data
       });
     } else {
       return request({
         url: `api/${res}/${path}`,
         method: method,
-        data: filter
+        data
       });
     }
   },

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

@@ -164,9 +164,9 @@
               let res;
 
               if (this.column.isSourceCustom) {
-                res = await customModelApi.query(this.column.source, param);
+                res = await customModelApi.query(this.column.source, param, [this.column.sourceDataCode, this.column.sourceDisplayCode]);
               } else {
-                res = await modelApi.query(this.column.source, param);
+                res = await modelApi.query(this.column.source, param, [this.column.sourceDataCode, this.column.sourceDisplayCode]);
               }
 
               res.data.forEach(item => {

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

@@ -140,7 +140,7 @@
 
           this.loadDataView(this.source).then(async view => {
             if (view.dataView.isCustom) {
-              let res = await customModelApi.query(view.dataView.model, filter);
+              let res = await customModelApi.query(view.dataView.model, filter, [this.sourceDataCode, this.sourceDisplayCode]);
               if (res.data.length > 0) {
                 this.selected = res.data
                   .map(item => {
@@ -164,7 +164,7 @@
                 //this.$forceUpdate();
               }
             } else {
-              let res = await modelApi.query(view.dataView.model, filter);
+              let res = await modelApi.query(view.dataView.model, filter, [this.sourceDataCode, this.sourceDisplayCode]);
               if (res.data.length > 0) {
                 this.selected = res.data
                   .map(item => {

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);
+          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param);
+          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 

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

@@ -208,7 +208,7 @@
             this.total = res.totalCount;
             this.data = res.table;
           } else {
-            let res = await modelApi.query(this.tableView.model, filter, this.tableView.functionName, this.tableView.functionType);
+            let res = await modelApi.query(this.tableView.model, filter, null, null, this.tableView.functionName, this.tableView.functionType);
 
             this.total = res.totalCount;
             this.data = res.data;

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);
+          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param);
+          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 
@@ -836,9 +836,9 @@
                 }
 
                 if (column.isSourceCustom) {
-                  res = await customModelApi.query(column.sourceModel, param);
+                  res = await customModelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null);
                 } else {
-                  res = await modelApi.query(column.sourceModel, param, tableView.functionName, tableView.functionType);
+                  res = await modelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null, tableView.functionName, tableView.functionType);
                 }
 
                 this.$refs['list_' + column.code][0].loadData(res.data);
@@ -1119,9 +1119,9 @@
               let res;
 
               if (column.isSourceCustom) {
-                res = await customModelApi.query(column.source, param);
+                res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
               } else {
-                res = await modelApi.query(column.source, param);
+                res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
               }
 
               res.data.forEach(item => {

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

@@ -606,9 +606,9 @@
                     param[column.sourceDataCode] = this.data.id;
 
                     if (column.isSourceCustom) {
-                      res = await customModelApi.query(column.sourceModel, param);
+                      res = await customModelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null);
                     } else {
-                      res = await modelApi.query(column.sourceModel, param, tableView.functionName, tableView.functionType);
+                      res = await modelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null, tableView.functionName, tableView.functionType);
                     }
 
                     this.$refs['table_' + column.code][0].loadData(res.data);
@@ -1166,9 +1166,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param);
+          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param);
+          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 

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

@@ -1284,7 +1284,7 @@
           }
 
           if (this.tableView.isCustom) {
-            let res = await customModelApi.query(this.tableView.model, data);
+            let res = await customModelApi.query(this.tableView.model, data, null, this.tableView.isReturnSimple ? this.tableView : null);
 
             this.total = res.totalCount;
             this.data = res.data;
@@ -1294,7 +1294,14 @@
             this.total = res.totalCount;
             this.data = res.table;
           } else {
-            let res = await modelApi.query(this.tableView.model, data, this.tableView.functionName, this.tableView.functionType);
+            let res = await modelApi.query(
+              this.tableView.model,
+              data,
+              null,
+              this.tableView.isReturnSimple ? this.tableView : null,
+              this.tableView.functionName,
+              this.tableView.functionType
+            );
 
             this.total = res.totalCount;
             this.data = res.data;
@@ -1412,12 +1419,19 @@
        * @param {int} index 行序号
        * @public
        */
-      edit(row, index) {
+      async edit(row, index) {
+        let data = row;
+        if (this.tableView.isCustom) {
+          data = await customModelApi.get(this.tableView.model, row.id);
+        } else if (!this.tableView.isDataSource) {
+          data = await modelApi.get(this.tableView.model, row.id);
+        }
+
         /**
          * 编辑事件
          * @property {object} args { row 行对象, index 行序号 }
          */
-        this.$emit('edit', { row, index });
+        this.$emit('edit', { row: data, index });
       },
       /**
        * 查看项
@@ -1426,12 +1440,19 @@
        * @param {int} index 行序号
        * @public
        */
-      show(row, index) {
+      async show(row, index) {
+        let data = row;
+        if (this.tableView.isCustom) {
+          data = await customModelApi.get(this.tableView.model, row.id);
+        } else if (!this.tableView.isDataSource) {
+          data = await modelApi.get(this.tableView.model, row.id);
+        }
+
         /**
          * 查看事件
          * @property {object} args { row 行对象, index 行序号 }
          */
-        this.$emit('show', { row, index });
+        this.$emit('show', { row: data, index });
       },
       /**
        * 删除项
@@ -1897,9 +1918,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param);
+          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param);
+          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 
@@ -2833,9 +2854,9 @@
             let res;
 
             if (column.isSourceCustom) {
-              res = await customModelApi.query(column.source, param);
+              res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
             } else {
-              res = await modelApi.query(column.source, param);
+              res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
             }
 
             res.data.forEach(item => {

package/src/mixins/page.js

@@ -75,7 +75,6 @@ export default {
     ...mapState('admin/user', ['info']),
     ...mapState('admin/cache', ['userNames', 'enums', 'dicts', 'caches']),
     ...mapState('admin/menu', ['userPermissions']),
-    ...mapState('admin/displayFormat', ['defaultFormat']),
     rootPath() {
       return !(import.meta.env.VITE_APP_BASE_PATH || '').trim() ? '/static/' : '/' + import.meta.env.VITE_APP_BASE_PATH + '/static/';
     },

package/src/pages/system/user.vue

@@ -154,9 +154,9 @@
         // 参数完整，查询数据
         let res;
         if (data.isSourceCustom) {
-          res = await customModelApi.query(data.source, param);
+          res = await customModelApi.query(data.source, param, [data.sourceDataCode, data.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(data.source, param);
+          res = await modelApi.query(data.source, param, [data.sourceDataCode, data.sourceDisplayCode]);
         }
         res.data.forEach(item => {
           data._dataSource.push({

package/test/main.js

@@ -5,7 +5,7 @@ if (!!window.ActiveXObject || 'ActiveXObject' in window) {
 import { createApp, h } from 'vue';
 
 // 基础框架
-import { App, created, showFormat } from '../src';
+import { App, created } from '../src';
 
 // 固定路由
 import routes from './router/routes';
@@ -24,8 +24,4 @@ const app = createApp({
   created: () => created(app, routes, files)
 });
 
-showFormat.customFormat = (model, column) => {
-  console.log('customFormat', model, column);
-};
-
 app.mount('#app');