mooho-base-admin-plus 0.4.16 → 0.4.19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.16",
+  "version": "0.4.19",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/src/api/application.js

@@ -3,25 +3,41 @@ import request from '../libs/request';
 const res = 'Application';
 
 export default {
-  submit(applicationTypeID, model) {
-    return request({
-      url: `api/${res}/submit`,
-      method: 'post',
-      data: {
-        applicationTypeID,
-        model
-      }
-    });
+  submit(applicationType, model) {
+    if (applicationType.isCustom) {
+      return request({
+        url: `api/${res}/submit`,
+        method: 'post',
+        data: {
+          applicationTypeID: applicationType.id,
+          model
+        }
+      });
+    } else {
+      return request({
+        url: `api/${applicationType.model}/submit`,
+        method: 'post',
+        data: model
+      });
+    }
   },
-  save(applicationTypeID, model) {
-    return request({
-      url: `api/${res}/save`,
-      method: 'post',
-      data: {
-        applicationTypeID,
-        model
-      }
-    });
+  save(applicationType, model) {
+    if (applicationType.isCustom) {
+      return request({
+        url: `api/${res}/save`,
+        method: 'post',
+        data: {
+          applicationTypeID: applicationType.id,
+          model
+        }
+      });
+    } else {
+      return request({
+        url: `api/${applicationType.model}/save`,
+        method: 'post',
+        data: model
+      });
+    }
   },
   cancel(id) {
     return request({

package/src/api/customModel.js

@@ -158,14 +158,14 @@ export default {
       data.groupColumn = JSON.parse(tableView.groupColumn);
       data.groupMethod = JSON.parse(tableView.groupMethod);
 
-      await request({
+      result = await request({
         url: `api/${res}/group`,
         method: 'post',
         responseType: 'blob',
         data
       });
     } else {
-      await request({
+      result = await request({
         url: `api/${res}/query`,
         method: 'post',
         responseType: 'blob',

package/src/components/workflow/flow-chart.vue

@@ -688,8 +688,8 @@
       },
       // 鼠标移动
       mousemove(e) {
-        this.current.x = e.layerX;
-        this.current.y = e.layerY;
+        this.current.x = e.offsetX;
+        this.current.y = e.offsetY;
         //this.$forceUpdate();
 
         if (this.isMoving) {

package/src/mixins/page.js

@@ -439,7 +439,7 @@ export default {
               let data = this.parseData(model, expression);
 
               if (data == null) {
-                result += 'null';
+                result += expression;
               } else if (isNaN(data)) {
                 result += "'" + String(data) + "'";
               } else {
@@ -501,6 +501,9 @@ export default {
             data = '';
           }
           let value = setting.condition[i].value;
+          if (value == null) {
+            value = '';
+          }
           let operator = setting.condition[i].operator;
           let result = false;
 

package/src/pages/template/processPage.vue

@@ -188,7 +188,7 @@
           }
 
           this.confirm('Front_Msg_Sure_To_Submit', async () => {
-            await applicationApi.submit(this.page.applicationTypeID, data);
+            await applicationApi.submit(this.page.applicationType, data);
 
             this.success('Front_Msg_Success', () => {
               this.$refs.table.loadData();
@@ -207,7 +207,7 @@
         }
 
         this.confirm('Front_Msg_Sure_To_Save', async () => {
-          let res = await applicationApi.save(this.page.applicationTypeID, data);
+          let res = await applicationApi.save(this.page.applicationType, data);
 
           this.success('Front_Msg_Success', () => {
             this.$refs.table.loadData();

package/src/styles/css/default.css

@@ -223,10 +223,15 @@
   margin-top: 4px;
 }
 
+.filter .ivu-col {
+  margin-top: 0px;
+  margin-bottom: 4px;
+}
+
 .filter .ivu-form-item-label {
   float: left;
-  line-height: 6px;
-  padding: 10px 12px 10px 0;
+  line-height: 24px;
+  padding: 0px 12px 0px 0;
 }
 
 .filter .ivu-form-item {