doway-coms 1.4.36 → 1.4.38

package/packages/BaseForm/src/index.vue

@@ -29,7 +29,7 @@
       />
       <!-- 按钮弹出框输入控件 -->
       <!-- isButtonShow字段是额外添加字段，用于控制区分输入框控件 -->
-      <base-button
+      <BaseButton
         v-if="col.isButtonShow == true"
         v-model="row[col.field]"
         :colInfo="col"
@@ -268,6 +268,7 @@ import BaseDate from "../../BaseDate/index";
 import BaseDatetime from "../../BaseDatetime/index";
 import BaseDateWeek from "../../BaseDateWeek/index";
 import BaseTextArea from "../../BaseTextArea/index";
+import BaseButton from "../../BaseButton/index";
 import BaseSelect from "../../BaseSelect/index";
 import BaseSelectMulti from "../../BaseSelectMulti/index";
 import BaseTime from "../../BaseTime/index";
@@ -284,6 +285,7 @@ export default {
     BaseDatetime,
     BaseDateWeek,
     BaseTextArea,
+    BaseButton,
     BaseSelect,
     BaseSelectMulti,
     BaseTime,

package/packages/BaseGrid/src/index.vue

@@ -2350,7 +2350,6 @@ export default {
         };
         let expStr = "";
         let filterBindingValues = loopColInfo.filters[0].data.bindingValues;
-        debugger
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };
 

package/packages/index.js

@@ -20,6 +20,7 @@ import BasePrintPreview from './BasePrintPreview/index';
 import BaseGantt from "./BaseGantt/index";
 import BaseKanbanEmpty from "./BaseKanbanEmpty/index";
 import BaseSearch from "./BaseSearch/index";
+import BaseButton from "./BaseButton/index";
 
 import store from './utils/store'
 import request from './utils/request'
@@ -31,7 +32,7 @@ const components = [
 	BaseTextArea, BaseSelect, BaseSelectMulti, BaseTime, BasePagination,
 	BaseNumberInput, BaseTool, BaseToolStatus, BasePulldown, BaseIntervalInput,
 	BaseForm, BasePictureCard, BaseGrid, BasePrintPreview, BaseGantt,
-	BaseKanbanEmpty, BaseSearch
+	BaseKanbanEmpty, BaseSearch, BaseButton
 ];
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 
@@ -156,6 +157,7 @@ export {
 	BaseGantt,
 	BaseKanbanEmpty,
 	BaseSearch,
+	BaseButton,
 	store,
 	request,
 }

package/packages/utils/request.js

@@ -27,13 +27,13 @@ service.interceptors.request.use(
 
 // respone interceptor
 service.interceptors.response.use(
-  response => {
+  async response => {
     const res = response.data
     // 导出文件进入判断
     if (res instanceof Blob) {
       if (res.type === 'application/json') {
-        const enc = new TextDecoder('utf-8');
-        res.arrayBuffer().then((buffer) => {
+        const enc = await new TextDecoder('utf-8');
+        await res.arrayBuffer().then((buffer) => {
           const tempData = JSON.parse(enc.decode(new Uint8Array(buffer))) || {};
           if (tempData['code'] && tempData['code'] === 500) {
             notification.error({
@@ -45,8 +45,10 @@ service.interceptors.response.use(
                 ])
               }
             })
+            return Promise.reject(tempData['msg'])
           }
-        });
+        })
+        .catch(reason => Promise.reject(reason))
       }
       return response;
     }