@dt-frames/ui 1.0.7 → 1.0.8

package/es/components/source/src/hooks/useFetch.d.ts

@@ -1,5 +1,4 @@
-import { ApiType } from "../types/source.type";
-import { Recordable } from "@dt-frames/core";
+import { Recordable, ApiType } from "@dt-frames/core";
 export declare function useFetch(api: string | ApiType, baseUrl?: string): {
     fetch: (params?: Recordable) => Promise<unknown>;
 };

package/es/components/source/src/types/source.type.d.ts

@@ -1,4 +1,4 @@
-import { Recordable } from "@dt-frames/core";
+import { Recordable, ApiType } from "@dt-frames/core";
 export declare type PageQueryType = {
     entityDTO: Recordable;
     orderDTOs: Recordable[];
@@ -8,14 +8,6 @@ export declare type PageQueryType = {
         [key: string]: any;
     };
 };
-export declare type ApiType = {
-    api: string;
-    type?: 'get' | 'post' | 'put' | 'delete';
-    header?: any;
-    model?: Recordable;
-    beforeFetch?: <T = any>(params: T) => T;
-    afterFetch?: <T = any>(data: any) => T;
-};
 export declare type ApiObjType = {
     add?: string | ApiType;
     update?: string | ApiType;

package/es/index.js

@@ -1,6 +1,6 @@
 import { defineComponent, resolveComponent, openBlock, createBlock, computed, unref, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, ref, watch, Fragment, renderList, createTextVNode, toDisplayString, KeepAlive, createVNode, withCtx, reactive, toRaw, getCurrentInstance, watchEffect, nextTick, onUnmounted, toRefs, isVNode, inject, h, provide, onMounted, onBeforeUnmount, resolveDynamicComponent, renderSlot, createCommentVNode, mergeProps, readonly, isRef, withDirectives, resolveDirective, render, normalizeProps, guardReactiveProps, createSlots, useAttrs as useAttrs$1, vShow, toRef, withModifiers, Transition } from "vue";
 import { isString, isArray as isArray$1, isObject, isFunction, error, useTimeoutFn, useAttrs, useSlots, dispatchResize, BAR_MAP, off, renderThumbStyle, on, useAppStore, addResizeListener, removeResizeListener, windowResizeFn, isNumber, isBoolean, isNull, DtCache, CacheKey, deepMerge, dateFormat, http, getDynamicProps, getDictValueByCode, formatNumber, isVnode, getPopupContainer, isNullAndUnDef, useMessage, useTheme, useMenu, useHeader, useGo, Pages, localeList, changeLocale, Theme, MenuMode, MenuType, useThemeStore, ContentMode, useMultipleTab, copyText, MenuSplitTye, isUrl, openWindow, RouteReuseStore, menuList2Map, useApp } from "@dt-frames/core";
-import { InputSearch, Tooltip, Modal as Modal$1, RadioGroup, RadioButton, InputGroup, Input, Button, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Form, FormItem, Row, Dropdown, Menu, MenuItem, Popover, CheckboxGroup, Table, message, Spin, BackTop, Breadcrumb, Avatar, Drawer, Empty, SubMenu, LayoutHeader, LayoutSider, MenuDivider, Tabs, TabPane, LayoutFooter, LayoutContent, ConfigProvider, Layout } from "ant-design-vue";
+import { InputSearch, Tooltip, Modal as Modal$1, RadioGroup, RadioButton, InputGroup, Input, Button, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Form, FormItem, Row, Dropdown, Menu, MenuItem, Popover, CheckboxGroup, Table, Spin, BackTop, Breadcrumb, Avatar, Drawer, Empty, SubMenu, LayoutHeader, LayoutSider, MenuDivider, Tabs, TabPane, LayoutFooter, LayoutContent, ConfigProvider, Layout } from "ant-design-vue";
 import { isEqual, cloneDeep, upperFirst, set, uniqBy, omit, trim } from "lodash-es";
 import { tryOnUnmounted, isFunction as isFunction$1, useFullscreen, useDebounceFn, useThrottleFn } from "@vueuse/core";
 import Sortablejs from "sortablejs";
@@ -6338,33 +6338,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 }
 var index = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["render", _sfc_render]]);
 function useFetch(api, baseUrl = "") {
-  const getApiObj = () => {
+  function fetch(params = {}) {
+    let type = "post", header = {}, model = {}, _api = "";
     if (isString(api)) {
-      return { api };
-    }
-    return { ...api };
-  };
-  const getParams = (params = {}) => {
-    const { model, beforeFetch } = getApiObj();
-    if (!api) {
-      message.error("\u8BF7\u6C42\u7684url\u4E0D\u80FD\u4E3A\u7A7A");
-      return false;
+      _api = baseUrl + api;
+    } else {
+      type = api.type;
+      _api = baseUrl + api.api;
+      header = api.header;
+      model = api.model;
     }
-    return beforeFetch && isFunction(beforeFetch) ? beforeFetch(Object.assign({}, model, params)) : params;
-  };
-  function fetch(params = {}) {
-    const handleParams = getParams(params);
-    if (isBoolean(handleParams) && handleParams === false)
-      return Promise.resolve();
-    const { api: _api, type = "post", header = {}, afterFetch } = getApiObj();
     return new Promise((resolve, reject) => {
-      http[type](`${baseUrl}${_api}`, handleParams, {
+      http[type](_api, Object.assign({}, model, params), {
         ...header,
         ...{ onlyData: false }
       }).then((data) => {
-        if (afterFetch && isFunction(afterFetch)) {
-          data = afterFetch(data);
-        }
         resolve(data == null ? void 0 : data.data);
       }, (error2) => {
         reject(error2);
@@ -6406,7 +6394,7 @@ function useSource(opt) {
   };
   const { baseUrl = "", api = {}, exportName = "" } = opt;
   const { add, deletes, update, queryById, queryPage } = api;
-  const { message: message2 } = useMessage();
+  const { message } = useMessage();
   const apiFul = {};
   for (let it in api) {
     loading["on" + it.slice(0, 1).toUpperCase() + it.slice(1).toLowerCase()] = ref(false);
@@ -6470,7 +6458,7 @@ function useSource(opt) {
   function onAdd(model) {
     const { fetch } = useFetch(add, baseUrl);
     fetch(model).then((rsp) => {
-      message2.success("\u65B0\u589E\u6210\u529F");
+      message.success("\u65B0\u589E\u6210\u529F");
       search();
     });
   }
@@ -6481,7 +6469,7 @@ function useSource(opt) {
   function onUpdate(model) {
     const { fetch } = useFetch(update, baseUrl);
     fetch(model).then((rsp) => {
-      message2.success("\u66F4\u65B0\u6570\u636E\u6210\u529F");
+      message.success("\u66F4\u65B0\u6570\u636E\u6210\u529F");
       search();
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"keywords": [
 		"ui",
 		"dt-ui"

package/src/components/source/src/hooks/useFetch.ts

@@ -1,58 +1,27 @@
-import { ApiType } from "../types/source.type";
-import { message } from 'ant-design-vue'
-import { http, isBoolean, isFunction, isString, JsonResult, Recordable } from "@dt-frames/core";
+import { http, isString, JsonResult, Recordable, ApiType } from "@dt-frames/core";
 
 export function useFetch(api: string | ApiType, baseUrl: string = '') {
-    
-    const getApiObj= () => {
-        if( isString(api) ) {
-            return { api }
-        }
-
-        return { ...api }
-    }
-
-    /**
-     * 是否可以向服务器发送请求
-     * 如果beforeFetch返回的是false, 则停止请求
-     * */ 
-    const getParams = (params: Recordable = { }) => {
-        const { model, beforeFetch } = getApiObj()
-
-        if( !api ) {
-            message.error('请求的url不能为空')
-            return false
-        }
-
-        return beforeFetch && isFunction( beforeFetch ) 
-            ? beforeFetch( Object.assign({}, model, params) )
-            : params
-    }
-
-
-
     /**
      * 发送请求
      * handleParams 记录返回的值
      */
     function fetch(params: Recordable = { }) {
-        const handleParams = getParams( params )
-
-        if( isBoolean( handleParams ) && handleParams === false)
-            return Promise.resolve()
-
-        const { api: _api, type = 'post', header = { }, afterFetch } = getApiObj()
+        let type = 'post', header = { }, model = {}, _api = ''
+        if(isString( api )) {
+            _api = baseUrl + api
+        } else {
+            type = api.type
+            _api = baseUrl + api.api
+            header = api.header
+            model = api.model
+        }
 
         return new Promise(( resolve, reject ) => {
-            http[type]( `${ baseUrl }${_api}`, handleParams, {
+            http[type]( _api, Object.assign({}, model, params), {
                 ...header,
                 ...{ onlyData: false }
             }).then(
                 (data: JsonResult) => { 
-                    if( afterFetch && isFunction(afterFetch) ) {
-                        data = afterFetch( data )
-                    }
-                    
                     resolve( data?.data )
                 },
                 (error) => {

package/src/components/source/src/hooks/useSource.ts

@@ -1,11 +1,11 @@
 import { ref, reactive, toRaw, Ref } from 'vue'
 import { isString, Recordable, useMessage } from "@dt-frames/core"
-import { ApiType, BaseDataType, SourceType } from "../types/source.type"
+import { BaseDataType, SourceType } from "../types/source.type"
 import { useFetch } from './useFetch'
 import { TableParamsType } from '../types/table.type'
 import { DownloadType } from '../../../table/src/types/tableHeader.type'
 import { handleDownloadPage } from '../../../excel/index'
-import { useAppStore } from '@dt-frames/core'
+import { useAppStore, ApiType } from '@dt-frames/core'
 
 export function useSource(opt: SourceType) {
     const loading: {

package/src/components/source/src/types/source.type.ts

@@ -1,4 +1,4 @@
-import { Recordable } from "@dt-frames/core"
+import { Recordable, ApiType } from "@dt-frames/core"
 
 export type PageQueryType = {
     entityDTO: Recordable,
@@ -10,26 +10,6 @@ export type PageQueryType = {
     }
 }
 
-export type ApiType = {
-    // api接口
-    api: string
-
-    // 请求类型
-    type?: 'get' | 'post' | 'put' | 'delete',
-
-    // 请求头信息
-    header?: any
-
-    // 默认的基础数据
-    model?: Recordable
-
-    // 请求之前
-    beforeFetch?: <T = any>( params: T ) => T
-
-    // 请求之后
-    afterFetch?: <T = any>( data: any)  => T
-}
-
 
 export type ApiObjType = {
     // 新增