s-material-react 0.1.6 → 0.1.8

package/dist/components/GoodsDetail/index.js

@@ -1,78 +1,27 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { memo, useEffect, useState } from 'react';
-import { useComponent } from '@brushes/qj-simulate-component';
-import { queryPromotionListByGoodsCode } from '@brushes/api';
+import { memo } from 'react';
 import { _ } from '@brushes/tools';
 import { getEnv } from '@brushes/api';
 import GoodsDetailPromotion from './components/goodsDetailPromotion';
 import GoodsDetailCoupon from './components/goodsDetailCoupon';
-import { goodsDetailFake } from '../../common/mock';
 import GoodsDetailCollection from './components/goodsDetailCollection';
 import GoodsDetailHandleBar from './components/goodsDetailHandleBar';
 import { Slider } from '../Slider';
 import GoodsDetailInfo from './components/goodsDetailInfo';
 import GoodsDetailEvaluate from './components/goodsDetailEvaluate';
 import GoodsDetailSize from './components/goodsDetailSize';
+import { useGoodsDetailmpl } from './hooks';
 const flag = getEnv();
-const { isEmpty, get } = _;
-const GoodsDetailJsx = () => {
+const { isEmpty } = _;
+const GoodsDetailJsx = ({ skuCode = '' }) => {
     var _a;
-    const [goods, setGoods] = useState({});
-    const { View, Text, Skeleton } = useComponent();
-    const [promotionArr, setPromotionArr] = useState([]);
-    const [checkCollectionObj, setCheckCollectionObj] = useState({});
-    const [sliderArr, setSliderArr] = useState([]);
-    const [tabActive, setTabActive] = useState(1);
-    const [popupVisible, setPopupVisible] = useState(false);
-    useEffect(() => {
-        getGoodsDetailData();
-    }, []);
-    const getGoodsDetailData = () => __awaiter(void 0, void 0, void 0, function* () {
-        // const result = await getResourceGoodsInfoBySkuCode({
-        //   skuCode: '639978727769698312'
-        // });
-        const goodsDetailResult = goodsDetailFake;
-        const promotionListParams = {
-            skuNo: goodsDetailResult.skuNo || '',
-            skuCode: goodsDetailResult.rsSkuDomainList[0].skuCode || '',
-            classtreeCode: goodsDetailResult.classtreeCode || '',
-            brandCode: goodsDetailResult.brandCode || '',
-            pntreeCode: goodsDetailResult.pntreeCode || '',
-            memberCode: goodsDetailResult.memberCode || ''
-        };
-        console.log(22, goodsDetailResult.rsGoodsFileDomainList);
-        const arr = get(goodsDetailResult, 'rsGoodsFileDomainList', []);
-        if (isEmpty(arr))
-            return;
-        const sliderData = arr.map((item) => {
-            return {
-                imgUrl: item.goodsFileUrl,
-                link: ''
-            };
-        });
-        setSliderArr(sliderData);
-        setGoods(goodsDetailResult);
-        getPromotionData(promotionListParams);
-    });
-    const getPromotionData = (params) => __awaiter(void 0, void 0, void 0, function* () {
-        const result = yield queryPromotionListByGoodsCode(params);
-        setPromotionArr(result);
-    });
+    const { View, Text, Skeleton, goods, promotionArr, checkCollectionObj, setCheckCollectionObj, sliderArr, tabActive, setTabActive, popupVisible, setPopupVisible } = useGoodsDetailmpl(skuCode);
     return (_jsx(View, Object.assign({ className: 'GoodsDetailWrap', style: {
             height: flag ? '100vh' : '600px',
             paddingBottom: flag ? '100vh' : '60px'
         } }, { children: isEmpty(goods) ? (_jsxs(View, Object.assign({ className: 'skeleton' }, { children: [_jsx(Skeleton, { animated: true, style: {
                         '--width': '100%',
                         '--height': '300px'
-                    } }), _jsx(Skeleton.Title, { animated: true }), _jsx(Skeleton.Paragraph, { lineCount: 10, animated: true })] }))) : (_jsxs(_Fragment, { children: [_jsx(View, Object.assign({ className: 'topSlider' }, { children: _jsx(Slider, { selectImg: sliderArr }) })), _jsxs(View, Object.assign({ className: 'goodsDetail-topInfo' }, { children: [_jsxs(View, { children: [_jsx(Text, Object.assign({ className: 'name' }, { children: goods === null || goods === void 0 ? void 0 : goods.goodsName })), _jsxs(Text, Object.assign({ className: 'price' }, { children: ["\uFFE5", (_a = goods === null || goods === void 0 ? void 0 : goods.pricesetNprice) === null || _a === void 0 ? void 0 : _a.toFixed(2)] }))] }), _jsx(View, Object.assign({ className: 'rPart' }, { children: _jsx(GoodsDetailCollection, { goods: goods, checkCollectionObj: checkCollectionObj, setCheckCollectionObj: setCheckCollectionObj }) }))] })), _jsx(GoodsDetailSize, { goods: goods, popupVisible: popupVisible, setPopupVisible: setPopupVisible }), _jsx(GoodsDetailPromotion, { promotionList: promotionArr }), _jsx(GoodsDetailCoupon, {}), _jsxs(View, Object.assign({ className: 'goodsDetailTab' }, { children: [_jsxs(View, Object.assign({ className: 'tabs' }, { children: [_jsxs(Text, Object.assign({ className: `tabsItem ${tabActive === 1 ? 'active' : ''}`, onClick: () => setTabActive(1) }, { children: ["\u5546\u54C1\u8BE6\u60C5", _jsx(Text, { className: 'line' })] })), _jsxs(Text, Object.assign({ className: `tabsItem ${tabActive === 2 ? 'active' : ''}`, onClick: () => setTabActive(2) }, { children: ["\u8BC4\u4EF7", _jsx(Text, { className: 'line' })] }))] })), _jsx(View, Object.assign({ className: 'group' }, { children: tabActive === 1 ? _jsx(GoodsDetailInfo, { goods: goods }) : _jsx(GoodsDetailEvaluate, {}) }))] })), _jsx(GoodsDetailHandleBar, {})] })) })));
+                    } }), _jsx(Skeleton.Title, { animated: true }), _jsx(Skeleton.Paragraph, { lineCount: 10, animated: true })] }))) : (_jsxs(_Fragment, { children: [_jsx(View, Object.assign({ className: 'topSlider' }, { children: _jsx(Slider, { selectImg: sliderArr }) })), _jsxs(View, Object.assign({ className: 'goodsDetail-topInfo' }, { children: [_jsxs(View, { children: [_jsx(Text, Object.assign({ className: 'name' }, { children: goods === null || goods === void 0 ? void 0 : goods.goodsName })), _jsxs(Text, Object.assign({ className: 'price' }, { children: ["\uFFE5", (_a = goods === null || goods === void 0 ? void 0 : goods.pricesetNprice) === null || _a === void 0 ? void 0 : _a.toFixed(2)] }))] }), _jsx(View, Object.assign({ className: 'rPart' }, { children: _jsx(GoodsDetailCollection, { goods: goods, checkCollectionObj: checkCollectionObj, setCheckCollectionObj: setCheckCollectionObj }) }))] })), _jsx(GoodsDetailSize, { goods: goods, popupVisible: popupVisible, setPopupVisible: setPopupVisible }), _jsx(GoodsDetailPromotion, { promotionList: promotionArr }), _jsx(GoodsDetailCoupon, {}), _jsxs(View, Object.assign({ className: 'goodsDetailTab' }, { children: [_jsxs(View, Object.assign({ className: 'tabs' }, { children: [_jsxs(Text, Object.assign({ className: `tabsItem ${tabActive === 1 ? 'active' : ''}`, onClick: () => setTabActive(1) }, { children: ["\u5546\u54C1\u8BE6\u60C5", _jsx(Text, { className: 'line' })] })), _jsxs(Text, Object.assign({ className: `tabsItem ${tabActive === 2 ? 'active' : ''}`, onClick: () => setTabActive(2) }, { children: ["\u8BC4\u4EF7", _jsx(Text, { className: 'line' })] }))] })), _jsx(View, Object.assign({ className: 'group' }, { children: tabActive === 1 ? (_jsx(GoodsDetailInfo, { tabActive: tabActive, goods: goods })) : (_jsx(GoodsDetailEvaluate, {})) }))] })), _jsx(GoodsDetailHandleBar, {})] })) })));
 };
 export const GoodsDetail = memo(GoodsDetailJsx);

package/dist/components/GoodsList/components/filter.d.ts

@@ -1 +1,5 @@
-export declare const Filter: () => JSX.Element;
+import { Dispatch } from 'react';
+import { FilterType } from '../index';
+export declare const Filter: ({ setParams }: {
+    setParams: Dispatch<FilterType>;
+}) => JSX.Element;

package/dist/components/GoodsList/components/filter.js

@@ -1,31 +1,43 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { useComponent } from '@brushes/qj-simulate-component';
+import { QjMobileIcon } from '../../../common/icon';
 const dataConfig = [
     {
         name: '默认',
-        code: 'pricesetNprice'
+        sortField: 'pricesetNprice'
     },
     {
         name: '新品',
-        code: ''
+        sortField: ''
     },
     {
         name: '销量',
-        code: 'goodsSalesvolume'
+        sortField: 'goodsSalesvolume',
+        order: 'asc'
     },
     {
         name: '价格',
-        code: 'pricesetNprice'
+        sortField: 'pricesetNprice',
+        order: 'asc'
     }
 ];
-export const Filter = () => {
+export const Filter = ({ setParams }) => {
     const { View } = useComponent();
     const [active, setActive] = useState(0);
-    const handleSort = (e) => {
-        const { index, type } = e.target.dataset;
+    const [config, setConfig] = useState(dataConfig);
+    const handleSort = (sortField, index, order) => {
         setActive(index);
-        console.log(30, type);
+        if (order) {
+            setConfig((prevState) => {
+                prevState[index].order = order === 'asc' ? 'desc' : 'asc';
+                return [...prevState];
+            });
+        }
+        setParams({
+            sortField,
+            order
+        });
     };
-    return (_jsx(View, Object.assign({ className: 'sortWrap' }, { children: dataConfig.map((item, index) => (_jsx(View, Object.assign({ "data-index": index, "data-type": item.code, className: `sortItem ${active === index ? 'active' : ''}`, onClick: handleSort }, { children: item.name }), index))) })));
+    return (_jsx(View, Object.assign({ className: 'sortWrap' }, { children: config.map(({ order, sortField, name }, index) => (_jsxs(View, Object.assign({ className: `sortItem ${active === index ? 'active' : ''}`, onClick: () => handleSort(sortField, index, order) }, { children: [name, order && (_jsx(QjMobileIcon, { style: { color: active === index ? '#f00' : '#444', fontSize: 20 }, value: order === 'desc' ? 'jiangxu' : 'shengxu' }))] }), index))) })));
 };

package/dist/components/GoodsList/hooks/useGoodsList.d.ts

@@ -1,5 +1,12 @@
-export declare function useGoodsList(classtreeCode: string): {
+import { FilterType } from '../index';
+export interface ListType {
+    skuCode: string;
+    dataPic: string;
+    goodsName: string;
+    pricesetNprice: number;
+}
+export declare function useGoodsList(classtreeCode: string, filterParmas: FilterType): {
     loading: boolean;
-    getData: (sortField?: string, order?: string) => Promise<void>;
-    list: never[];
+    getData: (...args: any[]) => any;
+    list: ListType[];
 };

package/dist/components/GoodsList/hooks/useGoodsList.js

@@ -9,38 +9,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { useEffect, useRef, useState } from 'react';
 import { find } from '@brushes/api';
-import { _ } from '@brushes/tools';
+import { _, useImmutableCallback } from '@brushes/tools';
 const { isEmpty } = _;
-export function useGoodsList(classtreeCode) {
+export function useGoodsList(classtreeCode, filterParmas) {
     const isCanScroll = useRef(true);
     const num = useRef(0);
     const [list, setList] = useState([]);
-    // const sortField = useRef('pricesetNprice');
-    // const order = useRef('asc');
     const [loading, setLoading] = useState(false);
     useEffect(() => {
-        getData();
-    }, []);
-    const getData = (sortField = 'pricesetNprice', order = 'asc') => __awaiter(this, void 0, void 0, function* () {
+        resetImpl();
+    }, [filterParmas]);
+    const resetImpl = useImmutableCallback(() => {
+        num.current = 0;
+        isCanScroll.current = true;
+        setList([]);
+        getData(filterParmas);
+    });
+    const getData = useImmutableCallback(({ sortField = 'pricesetNprice', order = '' }) => __awaiter(this, void 0, void 0, function* () {
         if (!isCanScroll.current)
             return;
         ++num.current;
         setLoading(true);
         const response = yield find({
             distinctField: 'goodsNo',
-            sortField: sortField,
+            sortField,
             order: order,
             goodsType: '00,50',
             page: num.current,
-            rows: 10
-            // classtreeCode,
+            rows: 10,
+            classtreeCode
         });
         if (isEmpty(response.list)) {
             isCanScroll.current = false;
         }
         setLoading(false);
         setList((prevState) => prevState.concat(response.list));
-    });
+    }));
     return {
         loading,
         getData,

package/dist/components/GoodsList/index.d.ts

@@ -1,2 +1,6 @@
 import React from 'react';
+export interface FilterType {
+    sortField: string;
+    order?: string | undefined;
+}
 export declare const GoodsList: React.NamedExoticComponent<{}>;

package/dist/components/GoodsList/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { memo } from 'react';
+import { memo, useState } from 'react';
 import { Loading, navigatorImpl, ScrollView, useComponent } from '@brushes/qj-simulate-component';
 import { QjMobileIcon } from '../../common/icon';
 import { Filter } from './components/filter';
@@ -7,9 +7,10 @@ import { useGoodsList } from './hooks/useGoodsList';
 import { routerMap } from '../../routerMap';
 const GoodsListJsx = ({ classtreeCode = '' }) => {
     const { View, Text } = useComponent();
-    const { loading, getData, list } = useGoodsList(classtreeCode);
-    return (_jsxs(View, Object.assign({ className: 'goodsList' }, { children: [_jsxs(View, Object.assign({ className: 'topInfo' }, { children: [_jsxs(View, Object.assign({ className: 'search' }, { children: [_jsx(QjMobileIcon, { value: "fenxiang" }), _jsx(Text, Object.assign({ className: 'title' }, { children: "\u641C\u7D22\u5546\u54C1" }))] })), _jsx(Filter, {})] })), _jsx(View, Object.assign({ className: 'listWrap' }, { children: _jsxs(ScrollView, Object.assign({ onScroll: () => getData(), style: { height: '100vh' } }, { children: [_jsx(View, Object.assign({ className: 'list' }, { children: list.map((item) => {
-                                return (_jsxs(View, Object.assign({ onClick: () => navigatorImpl(routerMap.goodDetail), className: 'listItem' }, { children: [_jsx(View, { className: 'img', style: { backgroundImage: `url(${item.dataPic})` } }), _jsx(Text, Object.assign({ className: 'name' }, { children: item.goodsName })), _jsxs(Text, Object.assign({ className: 'price' }, { children: ["\uFFE5 ", item.pricesetNprice.toFixed(2)] }))] }), item.skuCode));
+    const [filterParmas, setFilterParams] = useState({});
+    const { loading, getData, list } = useGoodsList(classtreeCode, filterParmas);
+    return (_jsxs(View, Object.assign({ className: 'goodsList' }, { children: [_jsxs(View, Object.assign({ className: 'top-info' }, { children: [_jsxs(View, Object.assign({ className: 'top-info-search', onClick: () => navigatorImpl(routerMap.search) }, { children: [_jsx(QjMobileIcon, { value: "fenxiang" }), _jsx(Text, { children: "\u641C\u7D22\u5546\u54C1" })] })), _jsx(Filter, { setParams: setFilterParams })] })), _jsx(View, Object.assign({ className: 'listWrap' }, { children: _jsxs(ScrollView, Object.assign({ onScroll: () => getData(filterParmas), style: { height: '100vh' } }, { children: [_jsx(View, Object.assign({ className: 'list' }, { children: list.map((item) => {
+                                return (_jsxs(View, Object.assign({ onClick: () => navigatorImpl(`${routerMap.goodDetail}?skuCode=${item.skuCode}`), className: 'listItem' }, { children: [_jsx(View, { className: 'img', style: { backgroundImage: `url(${item.dataPic})` } }), _jsx(Text, Object.assign({ className: 'name' }, { children: item.goodsName })), _jsxs(Text, Object.assign({ className: 'price' }, { children: ["\uFFE5 ", item.pricesetNprice.toFixed(2)] }))] }), item.skuCode));
                             }) })), loading ? _jsx(Loading, {}) : null] })) }))] })));
 };
 export const GoodsList = memo(GoodsListJsx);

package/dist/components/Line/index.d.ts

@@ -4,8 +4,8 @@ interface LineType {
     height: number;
     width: number;
     backgroundColor: string;
-    marginTop: number;
-    marginBottom: number;
+    paddingTop: number;
+    paddingBottom: number;
 }
 export declare const Line: React.NamedExoticComponent<LineType>;
 export {};

package/dist/components/Line/index.js

@@ -1,17 +1,18 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
 import { useComponent } from '@brushes/qj-simulate-component';
-const LineJsx = ({ borderRadius, height, width, backgroundColor, marginTop, marginBottom }) => {
+const LineJsx = ({ borderRadius, height, width, backgroundColor, paddingTop, paddingBottom }) => {
     const { View } = useComponent();
-    return (_jsx(View, { style: {
-            borderRadius: borderRadius + '%',
-            width: width + '%',
-            height: height + 'px',
-            backgroundColor,
-            marginLeft: 'auto',
-            marginRight: 'auto',
-            marginTop: marginTop + 'px',
-            marginBottom: marginBottom + 'px'
-        } }));
+    return (_jsx(View, Object.assign({ style: {
+            paddingTop,
+            paddingBottom
+        } }, { children: _jsx(View, { style: {
+                borderRadius: borderRadius + '%',
+                width: width + '%',
+                height: height + 'px',
+                backgroundColor,
+                marginLeft: 'auto',
+                marginRight: 'auto'
+            } }) })));
 };
 export const Line = memo(LineJsx);

package/dist/components/Notice/index.d.ts

@@ -1,9 +1,12 @@
 import React from 'react';
-export declare const Notice: ({ text, backgroundColor, color, fontSize, marginBottom, borderColor }: {
+export declare const Notice: ({ text, backgroundColor, color, fontSize, borderColor, paddingTop, paddingBottom, paddingLeft, paddingRight }: {
     fontSize: string;
     borderColor: string;
-    marginBottom: string;
     color: string;
     text: React.ReactNode;
     backgroundColor: string;
+    paddingTop: number;
+    paddingBottom: number;
+    paddingLeft: number;
+    paddingRight: number;
 }) => JSX.Element | null;

package/dist/components/Notice/index.js

@@ -1,16 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useComponent } from '@brushes/qj-simulate-component';
-import { getEnv } from '@brushes/api';
-export const Notice = ({ text, backgroundColor, color, fontSize, marginBottom, borderColor }) => {
-    const flag = getEnv();
+export const Notice = ({ text, backgroundColor, color, fontSize, borderColor, paddingTop, paddingBottom, paddingLeft, paddingRight }) => {
     const { View, NoticeBar } = useComponent();
-    console.log(22, flag);
     if (!View)
         return null;
-    return (_jsx(View, Object.assign({ style: { marginBottom } }, { children: _jsx(NoticeBar, { speed: 50, style: {
-                '--border-color': borderColor,
-                '--font-size': fontSize + 'px',
-                '--background-color': backgroundColor,
-                '--text-color': color
-            }, content: text, color: "alert" }) })));
+    return (_jsx(View, Object.assign({ style: { paddingTop, paddingBottom } }, { children: _jsx(View, { children: _jsx(NoticeBar, { speed: 50, style: {
+                    '--border-color': borderColor,
+                    '--font-size': fontSize + 'px',
+                    '--background-color': backgroundColor,
+                    '--text-color': color,
+                    paddingLeft,
+                    paddingRight
+                }, content: text, color: "alert" }) }) })));
 };

package/dist/components/Search/index.d.ts

@@ -5,8 +5,10 @@ interface SearchType {
     fontColor: string;
     backgroundColor: string;
     borderRadius: number;
-    marginTop: number;
-    marginBottom: number;
+    paddingTop: number;
+    paddingBottom: number;
+    paddingLeft: number;
+    paddingRight: number;
 }
 export declare const Search: React.NamedExoticComponent<SearchType>;
 export {};

package/dist/components/Search/index.js

@@ -2,29 +2,32 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from 'react';
 import { useComponent } from '@brushes/qj-simulate-component';
 import { SEARCH } from '../../static';
-const SearchJsx = ({ value, iconShow, fontColor, backgroundColor, borderRadius, marginTop, marginBottom }) => {
-    const { View } = useComponent();
-    return (_jsxs(View, Object.assign({ className: 'components-search', style: {
-            backgroundColor,
-            borderRadius: borderRadius + 'px',
-            marginTop: marginTop + 'px',
-            marginBottom: marginBottom + 'px',
-            height: '32px',
-            lineHeight: '32px',
-            width: '100%',
-            display: 'inline-block',
-            textAlign: 'center'
-        } }, { children: [_jsx("img", { src: SEARCH, alt: "", mode: 'fill', style: {
-                    height: '16px',
-                    width: '16px',
-                    display: iconShow ? 'inline-block' : 'none',
-                    verticalAlign: 'top',
-                    marginTop: '8px',
-                    marginRight: '10px'
-                } }), _jsx(View, Object.assign({ className: 'txt', style: {
-                    color: fontColor,
-                    display: 'inline-block',
-                    fontSize: '14px'
-                } }, { children: value }))] })));
+const SearchJsx = ({ value, iconShow, fontColor, backgroundColor, borderRadius, paddingTop, paddingBottom, paddingLeft, paddingRight }) => {
+    const { View, Image } = useComponent();
+    return (_jsx(View, Object.assign({ style: {
+            paddingTop,
+            paddingBottom,
+            paddingLeft,
+            paddingRight
+        } }, { children: _jsxs(View, Object.assign({ className: 'components-search', style: {
+                backgroundColor,
+                borderRadius: borderRadius + 'px',
+                height: '32px',
+                lineHeight: '32px',
+                width: '100%',
+                display: 'inline-block',
+                textAlign: 'center'
+            } }, { children: [_jsx(Image, { src: SEARCH, alt: "", mode: 'fill', style: {
+                        height: '16px',
+                        width: '16px',
+                        display: iconShow ? 'inline-block' : 'none',
+                        verticalAlign: 'top',
+                        marginTop: '8px',
+                        marginRight: '10px'
+                    } }), _jsx(View, Object.assign({ className: 'txt', style: {
+                        color: fontColor,
+                        display: 'inline-block',
+                        fontSize: '14px'
+                    } }, { children: value }))] })) })));
 };
 export const Search = memo(SearchJsx);

package/dist/components/Slider/index.d.ts

@@ -10,8 +10,10 @@ interface SwiperType {
     autoplayInterval?: number;
     direction?: 'horizontal' | 'vertical';
     loop?: boolean;
-    marginTop?: number;
-    marginBottom?: number;
+    paddingTop?: number;
+    paddingBottom?: number;
+    paddingLeft?: number;
+    paddingRight?: number;
     selectImg?: Array<itemType>;
     imgHeight?: {
         height: number;

package/dist/components/Slider/index.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { memo } from 'react';
-import { SmoothSwiper } from '@brushes/qj-simulate-component';
+import { SmoothSwiper, View } from '@brushes/qj-simulate-component';
 import { getEnv } from '@brushes/api';
 import { _ } from '@brushes/tools';
 import { Items } from './item';
 const { isUndefined, isEmpty } = _;
-const SwiperJsx = ({ defaultValue = [], type, autoplay, autoplayInterval, direction, loop, marginTop, marginBottom, selectImg, imgHeight }) => {
+const SwiperJsx = ({ defaultValue = [], type, autoplay, autoplayInterval, direction, loop, paddingTop, paddingBottom, paddingLeft, paddingRight, selectImg, imgHeight }) => {
     const [list, setList] = useState(defaultValue);
     useEffect(() => {
         const computedArr = selectImg
@@ -18,9 +18,11 @@ const SwiperJsx = ({ defaultValue = [], type, autoplay, autoplayInterval, direct
         }
         setList(arr);
     }, [selectImg]);
-    return (_jsx(SmoothSwiper, { className: getEnv() ? 'slider-block' : 'pc', style: {
-            marginTop: marginTop + 'px',
-            marginBottom: marginBottom + 'px'
-        }, imgHeight: imgHeight, data: list, type: type, autoplay: autoplay, autoplayInterval: autoplayInterval, direction: direction, loop: loop, render: (item) => _jsx(Items, { type: type, item: item }) }));
+    return (_jsx(View, Object.assign({ style: {
+            paddingTop,
+            paddingBottom,
+            paddingLeft,
+            paddingRight
+        } }, { children: _jsx(SmoothSwiper, { className: getEnv() ? 'slider-block' : 'pc', imgHeight: imgHeight, data: list, type: type, autoplay: autoplay, autoplayInterval: autoplayInterval, direction: direction, loop: loop, render: (item) => _jsx(Items, { type: type, item: item }) }) })));
 };
 export const Slider = memo(SwiperJsx);

package/dist/components/Title/index.d.ts

@@ -2,14 +2,16 @@ import React from 'react';
 interface TitleType {
     value: string;
     fontSize: number;
-    textAlign: number;
+    textAlign: any;
     color: string;
     backgroundColor: string;
     fontWeight: string;
     textDecoration: string;
     fontStyle: string;
-    marginTop: number;
-    marginBottom: number;
+    paddingTop: number;
+    paddingLeft: number;
+    paddingRight: number;
+    paddingBottom: number;
 }
 export declare const Title: React.NamedExoticComponent<TitleType>;
 export {};

package/dist/components/Title/index.js

@@ -1,18 +1,18 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
 import { useComponent } from '@brushes/qj-simulate-component';
-const TitleJsx = ({ value, fontSize, textAlign, color, backgroundColor, fontWeight, textDecoration, fontStyle, marginTop, marginBottom }) => {
+const TitleJsx = ({ value, fontSize, textAlign, color, backgroundColor, fontWeight, textDecoration, fontStyle, paddingTop, paddingLeft, paddingRight, paddingBottom }) => {
     const { View } = useComponent();
-    return (_jsx(View, Object.assign({ className: 'components-title', style: {
-            fontSize,
-            textAlign,
-            color,
-            backgroundColor,
-            fontWeight,
-            textDecoration,
-            fontStyle,
-            marginTop,
-            marginBottom
-        } }, { children: value })));
+    return (_jsx(View, Object.assign({ style: { paddingTop, paddingBottom } }, { children: _jsx(View, Object.assign({ style: {
+                fontSize,
+                textAlign,
+                color,
+                backgroundColor,
+                fontWeight,
+                textDecoration,
+                fontStyle,
+                paddingLeft,
+                paddingRight
+            } }, { children: value })) })));
 };
 export const Title = memo(TitleJsx);

package/dist/components/Video/index.d.ts

@@ -4,8 +4,10 @@ interface VideoType {
     poster: string;
     autoplay: boolean;
     loop: boolean;
-    marginTop: number;
-    marginBottom: number;
+    paddingTop: number;
+    paddingBottom: number;
+    paddingLeft: number;
+    paddingRight: number;
 }
 export declare const Video: React.NamedExoticComponent<VideoType>;
 export {};

package/dist/components/Video/index.js

@@ -1,11 +1,13 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
-const VideoJsx = ({ url, poster, autoplay, loop, marginTop, marginBottom }) => {
-    return (_jsx(_Fragment, { children: _jsx("video", { className: 'components-video', src: 'https://www.runoob.com/try/demo_source/movie.ogg', poster: poster, autoPlay: autoplay, loop: loop, controls: true, "object-fit": "contain", style: {
+import { useComponent } from '@brushes/qj-simulate-component';
+const VideoJsx = ({ url, poster, autoplay, loop, paddingTop, paddingBottom, paddingLeft, paddingRight }) => {
+    const { View } = useComponent();
+    return (_jsx(View, Object.assign({ style: { paddingTop, paddingBottom } }, { children: _jsx("video", { className: 'components-video', src: 'https://www.runoob.com/try/demo_source/movie.ogg', poster: poster, autoPlay: autoplay, loop: loop, controls: true, "object-fit": "contain", style: {
                 width: '100%',
                 height: '240px',
-                marginTop,
-                marginBottom
-            } }) }));
+                paddingLeft,
+                paddingRight
+            } }) })));
 };
 export const Video = memo(VideoJsx);

package/dist/routerMap/index.d.ts

@@ -5,4 +5,5 @@ export declare const routerMap: {
     goodDetail: string;
     result: string;
     rate: string;
+    search: string;
 };

package/dist/routerMap/index.js

@@ -4,5 +4,6 @@ export const routerMap = {
     goodList: '/subpackage/goodlist/index',
     goodDetail: '/subpackage/gooddetail/index',
     result: '/subpackage/result/index',
-    rate: '/subpackage/rate/index'
+    rate: '/subpackage/rate/index',
+    search: '/subpackage/search/index'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s-material-react",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "'组件库'",
   "main": "dist/index.js",
   "sideEffects": [
@@ -27,7 +27,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@brushes/api": "^0.2.6",
+    "@brushes/api": "^0.3.3",
     "@brushes/qj-simulate-component": "^0.0.9",
     "@brushes/tools": "^1.0.25",
     "@stencil/core": "^2.19.1",
@@ -35,7 +35,6 @@
     "@types/react": "^18.0.0",
     "china-division": "^2.5.0",
     "classnames": "^2.3.2",
-    "flyio": "^0.6.14",
     "nodemon": "^2.0.19",
     "prettier": "^2.7.1",
     "react": "^18.0.0",