beer-assembly-biz 1.1.1-alpha.8 → 1.1.2-alpha.1

package/MyPageContainer.js

@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from 'react';
+import { css } from '@emotion/css';
+import { PageContainer } from '@ant-design/pro-components';
+import { message, Modal, Tabs } from 'antd';
+import { Outlet, useLocation } from 'react-router-dom';
+import ParentContext from './content/ParentContext';
+const pathPartition = (sessionStorage.getItem('DETAIL_PARTITION') || '') === ''
+    ? ['CREATE', 'EDIT', 'COPY', 'AUDIT', 'PREVIEW', 'DETAIL', 'READ', 'IN', 'INPUT', 'OUTPUT']
+    : JSON.parse(sessionStorage.getItem('DETAIL_PARTITION') || '[]');
+export const Component = (props) => {
+    const location = useLocation();
+    const [messageApi, contextHolder] = message.useMessage();
+    const [modal, contextModalHolder] = Modal.useModal();
+    const [isSubpage, setIsSubpage] = useState(false);
+    useEffect(() => {
+        const partition = pathPartition.find(path => {
+            return location.pathname.toUpperCase()
+                .indexOf(`/${path}/`) > -1;
+        });
+        if (partition !== undefined) {
+            setIsSubpage(true);
+        }
+        else {
+            setIsSubpage(false);
+        }
+    }, [location]);
+    return React.createElement(React.Fragment, null,
+        React.createElement(ParentContext.Provider, { value: {
+                messageApi,
+                modal,
+                active: () => {
+                    props?.onRefresh?.();
+                }
+            } },
+            contextHolder,
+            contextModalHolder,
+            React.createElement(PageContainer, { style: { display: isSubpage ? 'none' : 'block' }, className: css `
+            .ant-page-header-heading {
+                padding-block-start: 0 !important;
+            }
+
+            .ant-page-header-heading-title {
+                font-size: 15px;
+                line-height: 1.5;
+                color: #333;
+            }
+        `, header: {
+                    style: {
+                        background: '#fff',
+                        padding: (props?.tabList?.length || 0) <= 0 ? '10px 24px 10px 24px' : '10px 24px 2px 24px',
+                        borderBottom: (props?.tabList?.length || 0) <= 0 ? '1px solid rgba(0, 0, 0, 0.06)' : undefined
+                    }
+                }, title: props.title, ghost: true, childrenContentStyle: {
+                    padding: '0'
+                } },
+                (props?.tabList?.length || 0) > 0 ? React.createElement(React.Fragment, null,
+                    React.createElement(Tabs, { size: "small", items: props?.tabList, className: css `
+                background: #fff;
+                border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+
+                .ant-tabs-nav::before {
+                    display: none;
+                }
+            `, tabBarStyle: { margin: '0 24px' }, onChange: (e) => props?.onTabChange?.(e) })) : undefined,
+                props?.banner,
+                React.createElement("div", { className: css `
+            padding: 12px 16px;
+        ` }, props.children)),
+            React.createElement(Outlet, null)));
+};
+export default Component;

package/Permission.d.ts

@@ -0,0 +1,8 @@
+import React, { FC } from 'react';
+export declare type PermissionProps = {
+    domain: string;
+    permission: string;
+    children?: React.ReactNode | undefined;
+};
+export declare const Component: FC<PermissionProps>;
+export default Component;

package/Permission.js

@@ -0,0 +1,7 @@
+import React, { useContext } from 'react';
+import PermissionContext from './content/PermissionContext';
+export const Component = (props) => {
+    const { isPermission } = useContext(PermissionContext);
+    return React.createElement(React.Fragment, null, isPermission(props.domain, props.permission) ? props?.children : undefined);
+};
+export default Component;

package/Upgrade.d.ts

@@ -0,0 +1,7 @@
+import { FC } from 'react';
+export declare type UpgradeComponentProps = {
+    localVersion: string;
+    request?: () => Promise<string> | undefined;
+};
+declare const App: FC<UpgradeComponentProps>;
+export default App;

package/Upgrade.js

@@ -0,0 +1,46 @@
+import React, { useEffect } from 'react';
+import { Modal } from 'antd';
+const TIME_KEY = 'VERSION_TIME';
+const App = (props) => {
+    useEffect(() => {
+        // 每5分钟执行一次
+        setTimeout(async () => {
+            // 读取缓存的上次弹出更新时间
+            const lastTime = Number(localStorage.getItem(TIME_KEY) || 0);
+            if (Number.isNaN(lastTime)) {
+                localStorage.removeItem(TIME_KEY);
+                return;
+            }
+            // 30分钟执行一次
+            if (new Date().getTime() <= lastTime + 1800000) {
+                return;
+            }
+            // 更新刷新时间
+            localStorage.setItem(TIME_KEY, new Date().getTime()
+                .toString());
+            const newVersion = await props.request?.();
+            if (newVersion === undefined || newVersion === '') {
+                return;
+            }
+            if (newVersion === props.localVersion) {
+                return;
+            }
+            // 弹出提示框
+            Modal.confirm({
+                title: '版本更新提示',
+                content: React.createElement(React.Fragment, null,
+                    React.createElement("p", { style: {
+                            fontSize: '15px',
+                            lineHeight: '26px'
+                        } }, "\u60A8\u5DF2\u7ECF\u957F\u65F6\u95F4\u672A\u4F7F\u7528\u6B64\u9875\u9762\uFF0C\u5728\u6B64\u671F\u95F4\u5E73\u53F0\u6709\u8FC7\u66F4\u65B0\uFF0C\u5982\u60A8\u6B64\u65F6\u5728\u9875\u9762\u4E2D\u6CA1\u6709\u586B\u5199\u76F8\u5173\u4FE1\u606F\u7B49\u64CD\u4F5C\uFF0C\u8BF7\u70B9\u51FB\u5237\u65B0\u9875\u9762\u4F7F\u7528\u6700\u65B0\u7248\u672C\uFF01")),
+                okText: '确定',
+                cancelText: '取消',
+                onOk: () => {
+                    window.location.reload();
+                }
+            });
+        }, 5000);
+    }, []);
+    return React.createElement(React.Fragment, null);
+};
+export default App;

package/auth/AuthPassword.d.ts

@@ -1,6 +1,10 @@
 import { Slider, SliderCodeToken } from 'beer-assembly/SliderCode';
 import React from 'react';
 export declare type AuthPasswordProps = {
+    /**
+     * 是否启用企业登录.
+     */
+    companyStatus?: boolean;
     /**
      * HTML 协议.
      */
@@ -22,6 +26,7 @@ export declare type AuthPasswordProps = {
     requestLogin?: (code: string | undefined, slider: Slider | undefined, params: {
         username: string;
         password: string;
+        companyName: string | undefined;
     }) => Promise<boolean>;
     /**
      * 发出错误消息

package/auth/AuthPassword.js

@@ -33,14 +33,20 @@ const App = (props) => {
     };
     const onConfirmLogin = async (code, slider) => {
         const params = form.getFieldsValue();
-        const result = (await props?.requestLogin?.(code, slider, params)) || true;
-        // 如果处理成功, 关闭Loading
-        if (result) {
-            setIsLoading(false);
+        const func = props?.requestLogin;
+        if (func !== undefined) {
+            const result = await func(code, slider, params);
+            if (!result) {
+                return false;
+            }
         }
-        return result;
+        // 如果处理成功, 关闭Loading
+        setIsLoading(false);
+        return true;
     };
     return React.createElement(Form, { form: form },
+        props?.companyStatus ? React.createElement(Form.Item, { name: "companyName", style: { marginBottom: 12 } },
+            React.createElement(Input, { className: "companyName", maxLength: 32, placeholder: "\u8BF7\u8F93\u5165\u4F01\u4E1A\u540D\u79F0", style: { height: 36 } })) : undefined,
         React.createElement(Form.Item, { name: "username", style: { marginBottom: 12 } },
             React.createElement(Input, { className: "input", maxLength: 32, placeholder: "\u8BF7\u8F93\u5165\u8D26\u53F7", style: { height: 36 } })),
         React.createElement(Form.Item, { name: "password", style: { marginBottom: 12 } },

package/auth/AuthStyle01.d.ts

@@ -8,7 +8,16 @@ declare type AuthStyleProps = {
     /**
      * Logo 图片.
      */
-    logo: string;
+    logo: {
+        /**
+         * 路径
+         */
+        path: string;
+        /**
+         * 高度
+         */
+        height?: number;
+    };
     /**
      * 侧边栏图片
      */
@@ -21,6 +30,10 @@ declare type AuthStyleProps = {
      * HTML 协议.
      */
     protocol?: string;
+    /**
+     * 企业状态.
+     */
+    companyStatus?: boolean;
     /**
      * HTML 关于.
      */
@@ -38,6 +51,7 @@ declare type AuthStyleProps = {
      * @param params 参数
      */
     systemLogin?: (params: {
+        companyName: string;
         account: string;
         password: string;
         authCode: string;
@@ -48,6 +62,10 @@ declare type AuthStyleProps = {
         code: string;
         data?: {};
     }>;
+    /**
+     * 登录处理.
+     */
+    login?: (userInfo: any) => void;
 };
 declare const App: FC<AuthStyleProps>;
 export default App;

package/auth/AuthStyle01.js

@@ -11,6 +11,7 @@ const App = (props) => {
         const result = await props?.systemLogin?.({
             account: params.username.trim(),
             password: params.password.trim(),
+            companyName: params.companyName?.trim() || '',
             authCode: slider?.authCode || '',
             code: code || ''
         });
@@ -20,7 +21,11 @@ const App = (props) => {
         }
         if (result.success) {
             setErrorMessage('');
-            Session.login(result.data);
+            if (props?.login === undefined) {
+                Session.login(result.data);
+                return true;
+            }
+            props?.login?.(result.data);
         }
         else {
             // 如果是1201 则是重新加载验证码
@@ -66,10 +71,10 @@ const App = (props) => {
             padding: 30px 40px 0 40px;
         ` },
                 React.createElement("img", { className: css `
-              height: 42px;
+              height: ${props?.logo?.height || 42}px;
               margin: 0 auto 0 auto;
               display: block;
-          `, src: props?.logo, alt: "" }),
+          `, src: props?.logo?.path, alt: "" }),
                 React.createElement("p", { className: css `
               font-size: 13px;
               margin: 6px auto 10px auto;
@@ -90,7 +95,7 @@ const App = (props) => {
                                         padding: '6px 10px',
                                         fontWeight: '500'
                                     }, message: errorMessage, type: "error", showIcon: true }) : undefined,
-                                React.createElement(AuthPassword, { protocol: props?.protocol, requestSlider: props?.requestSlider, sliderToken: props?.sliderToken, requestLogin: onConfirmLogin, onErrorMessage: (message) => setErrorMessage(message) }))
+                                React.createElement(AuthPassword, { companyStatus: props?.companyStatus, protocol: props?.protocol, requestSlider: props?.requestSlider, sliderToken: props?.sliderToken, requestLogin: onConfirmLogin, onErrorMessage: (message) => setErrorMessage(message) }))
                         }
                     ] })),
             React.createElement("p", { className: css `

package/auth/AuthStyle02.d.ts

@@ -8,11 +8,24 @@ declare type AuthStyleProps = {
     /**
      * Logo 图片.
      */
-    logo: string;
+    logo: {
+        /**
+         * 路径
+         */
+        path: string;
+        /**
+         * 高度
+         */
+        height?: number;
+    };
     /**
      * 描述.
      */
     description?: string;
+    /**
+     * 是否允许企业
+     */
+    companyStatus?: boolean;
     /**
      * HTML 协议.
      */
@@ -34,6 +47,7 @@ declare type AuthStyleProps = {
      * @param params 参数
      */
     systemLogin?: (params: {
+        companyName: string;
         account: string;
         password: string;
         authCode: string;
@@ -44,6 +58,10 @@ declare type AuthStyleProps = {
         code: string;
         data?: {};
     }>;
+    /**
+     * 登录处理.
+     */
+    login?: (userInfo: any) => void;
 };
 declare const App: FC<AuthStyleProps>;
 export default App;

package/auth/AuthStyle02.js

@@ -11,6 +11,7 @@ const App = (props) => {
         const result = await props?.systemLogin?.({
             account: params.username.trim(),
             password: params.password.trim(),
+            companyName: params?.companyName?.trim() || '',
             authCode: slider?.authCode || '',
             code: code || ''
         });
@@ -20,7 +21,11 @@ const App = (props) => {
         }
         if (result.success) {
             setErrorMessage('');
-            Session.login(result.data);
+            if (props?.login === undefined) {
+                Session.login(result.data);
+                return true;
+            }
+            props?.login?.(result.data);
         }
         else {
             // 如果是1201 则是重新加载验证码
@@ -59,10 +64,10 @@ const App = (props) => {
             padding: 30px 40px 0 40px;
         ` },
                 React.createElement("img", { className: css `
-              height: 42px;
+              height: ${props?.logo?.height || 42}px;
               margin: 0 auto 0 auto;
               display: block;
-          `, src: props.logo, alt: "" }),
+          `, src: props?.logo?.path, alt: "" }),
                 React.createElement("p", { className: css `
               font-size: 13px;
               margin: 6px auto 10px auto;
@@ -83,7 +88,7 @@ const App = (props) => {
                                         padding: '6px 10px',
                                         fontWeight: '500'
                                     }, message: errorMessage, type: "error", showIcon: true }) : undefined,
-                                React.createElement(AuthPassword, { protocol: props?.protocol, requestSlider: props?.requestSlider, sliderToken: props?.sliderToken, requestLogin: onConfirmLogin, onErrorMessage: (message) => setErrorMessage(message) }))
+                                React.createElement(AuthPassword, { companyStatus: props?.companyStatus, protocol: props?.protocol, requestSlider: props?.requestSlider, sliderToken: props?.sliderToken, requestLogin: onConfirmLogin, onErrorMessage: (message) => setErrorMessage(message) }))
                         }
                     ] })),
             React.createElement("p", { className: css `

package/content/ParentContext.d.ts

@@ -0,0 +1,8 @@
+import type { MessageInstance } from 'antd/es/message/interface';
+import type { HookAPI } from 'antd/es/modal/useModal';
+declare const ParentContext: import("react").Context<{
+    messageApi: MessageInstance | undefined;
+    modal: HookAPI | undefined;
+    active: () => void;
+}>;
+export default ParentContext;

package/content/ParentContext.js

@@ -0,0 +1,9 @@
+import { createContext } from 'react';
+const ParentContext = createContext({
+    messageApi: undefined,
+    modal: undefined,
+    active: () => {
+        console.log('parent context');
+    }
+});
+export default ParentContext;

package/content/PermissionContext.d.ts

@@ -0,0 +1,4 @@
+declare const PermissionContext: import("react").Context<{
+    isPermission: (domain: string, permission: string) => boolean;
+}>;
+export default PermissionContext;

package/content/PermissionContext.js

@@ -0,0 +1,12 @@
+import { createContext } from 'react';
+const PermissionContext = createContext({
+    isPermission: (domain, permission) => {
+        console.log('parent context' + domain);
+        console.log('parent context' + permission);
+        if (!permission) {
+            return false;
+        }
+        return true;
+    }
+});
+export default PermissionContext;

package/icon/directory.svg

@@ -1,9 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="23" fill="none" viewBox="0 0 28 23" x="150" y="130" data-name="spacearea" data-svg-id="ea31b1f100">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M2.25 22.5A2.25 2.25 0 0 1 0 20.25V2.583A2.25 2.25 0 0 1 2.25.333h7.083l2.334 2.334H25.75A2.25 2.25 0 0 1 28 4.917V20.25a2.25 2.25 0 0 1-2.25 2.25H2.25z" fill="url(#g)"/>
-    <defs>
-        <linearGradient id="g" x1="-13.917" y1="11.351" x2="7.53" y2="38.443" gradientUnits="userSpaceOnUse">
-            <stop stop-color="#6BBEFE"/>
-            <stop offset=".999" stop-color="#59ABFE"/>
-        </linearGradient>
-    </defs>
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="23" fill="none" viewBox="0 0 28 23" x="150" y="130"
+     data-name="spacearea" data-svg-id="ea31b1f100">
+  <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M2.25 22.5A2.25 2.25 0 0 1 0 20.25V2.583A2.25 2.25 0 0 1 2.25.333h7.083l2.334 2.334H25.75A2.25 2.25 0 0 1 28 4.917V20.25a2.25 2.25 0 0 1-2.25 2.25H2.25z"
+        fill="url(#g)"/>
+  <defs>
+    <linearGradient id="g" x1="-13.917" y1="11.351" x2="7.53" y2="38.443" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#6BBEFE"/>
+      <stop offset=".999" stop-color="#59ABFE"/>
+    </linearGradient>
+  </defs>
 </svg>

package/icon/empty.svg

@@ -1,43 +1,43 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="130" height="80">
-    <defs>
-        <linearGradient x1="52.348%" y1="74.611%" x2="52.348%" y2="-17.635%" id="a">
-            <stop stop-color="#DEDEDE" stop-opacity="0" offset="0%"/>
-            <stop stop-color="#A9A9A9" stop-opacity=".3" offset="100%"/>
-        </linearGradient>
-        <linearGradient x1="44.79%" y1="100%" x2="44.79%" y2="0%" id="b">
-            <stop stop-color="#FFF" stop-opacity="0" offset="0%"/>
-            <stop stop-color="#96A1C5" stop-opacity=".373" offset="100%"/>
-        </linearGradient>
-        <linearGradient x1="50%" y1="100%" x2="50%" y2="-19.675%" id="c">
-            <stop stop-color="#FFF" stop-opacity="0" offset="0%"/>
-            <stop stop-color="#919191" stop-opacity=".15" offset="100%"/>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="44.95%" id="d">
-            <stop stop-color="#5389F5" offset="0%"/>
-            <stop stop-color="#416FDC" offset="100%"/>
-        </linearGradient>
-        <linearGradient x1="63.345%" y1="100%" x2="63.345%" y2="-5.316%" id="e">
-            <stop stop-color="#DCE9FF" offset="0%"/>
-            <stop stop-color="#B6CFFF" offset="100%"/>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="f">
-            <stop stop-color="#7CA5F7" offset="0%"/>
-            <stop stop-color="#C4D6FC" offset="100%"/>
-        </linearGradient>
-    </defs>
-    <g transform="translate(-1.866 .364)" fill="none" fill-rule="evenodd">
-        <path d="M27.94 14.864c1.326-4.192 2.56-6.802 3.7-7.831 3.157-2.848 7.522-1.298 8.45-1.076 3.26.782 2.2-4.364 4.997-5.41 1.864-.697 3.397.155 4.6 2.556C50.752.863 52.375-.163 54.556.02c3.272.277 4.417 11.328 8.913 8.909 4.497-2.42 10.01-2.973 12.365.623.509.778.704-.429 4.166-4.55C83.462.88 86.914-.936 93.996 1.464c3.22 1.09 5.868 4.045 7.947 8.864 0 6.878 5.06 10.95 15.178 12.213 15.179 1.895 3.397 18.214-15.178 22.993-18.576 4.78-61.343 7.36-84.551-4.716C1.92 32.769 5.436 24.117 27.939 14.864z"
-              fill="url(#a)" opacity=".8"/>
-        <ellipse fill="url(#b)" cx="66" cy="69.166" rx="27.987" ry="6.478"/>
-        <path d="M113.25 77.249c-21.043 5.278-92.87-.759-100.515-3.516-3.721-1.343-7.075-3.868-10.061-7.576a2.822 2.822 0 0 1 2.198-4.593h125.514c2.605 6.938-3.107 12.166-17.136 15.685z"
-              fill="url(#c)" opacity=".675"/>
-        <g fill-rule="nonzero">
-            <path d="M43.396 12.098L33.825.906a2.434 2.434 0 0 0-1.837-.86h-20.58c-.706 0-1.377.324-1.837.86L0 12.098v6.144h43.396v-6.144z"
-                  fill="url(#d)" transform="translate(44.08 39.707)"/>
-            <path d="M40.684 18.468L32.307 8.72a2.136 2.136 0 0 0-1.622-.725H12.711c-.617 0-1.22.256-1.622.725l-8.377 9.748v5.354h37.972v-5.354z"
-                  fill="url(#e)" transform="translate(44.08 39.707)"/>
-            <path d="M43.396 25.283c0 .853-.384 1.62-.99 2.134l-.123.1a2.758 2.758 0 0 1-1.67.56H2.784c-.342 0-.669-.062-.971-.176l-.15-.06A2.802 2.802 0 0 1 0 25.282V12.165h10.529c1.163 0 2.1.957 2.1 2.118v.015c0 1.162.948 2.099 2.111 2.099h13.916a2.113 2.113 0 0 0 2.111-2.107c0-1.166.938-2.125 2.1-2.125h10.53z"
-                  fill="url(#f)" transform="translate(44.08 39.707)"/>
-        </g>
+  <defs>
+    <linearGradient x1="52.348%" y1="74.611%" x2="52.348%" y2="-17.635%" id="a">
+      <stop stop-color="#DEDEDE" stop-opacity="0" offset="0%"/>
+      <stop stop-color="#A9A9A9" stop-opacity=".3" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="44.79%" y1="100%" x2="44.79%" y2="0%" id="b">
+      <stop stop-color="#FFF" stop-opacity="0" offset="0%"/>
+      <stop stop-color="#96A1C5" stop-opacity=".373" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="50%" y1="100%" x2="50%" y2="-19.675%" id="c">
+      <stop stop-color="#FFF" stop-opacity="0" offset="0%"/>
+      <stop stop-color="#919191" stop-opacity=".15" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="50%" y1="0%" x2="50%" y2="44.95%" id="d">
+      <stop stop-color="#5389F5" offset="0%"/>
+      <stop stop-color="#416FDC" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="63.345%" y1="100%" x2="63.345%" y2="-5.316%" id="e">
+      <stop stop-color="#DCE9FF" offset="0%"/>
+      <stop stop-color="#B6CFFF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="f">
+      <stop stop-color="#7CA5F7" offset="0%"/>
+      <stop stop-color="#C4D6FC" offset="100%"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(-1.866 .364)" fill="none" fill-rule="evenodd">
+    <path d="M27.94 14.864c1.326-4.192 2.56-6.802 3.7-7.831 3.157-2.848 7.522-1.298 8.45-1.076 3.26.782 2.2-4.364 4.997-5.41 1.864-.697 3.397.155 4.6 2.556C50.752.863 52.375-.163 54.556.02c3.272.277 4.417 11.328 8.913 8.909 4.497-2.42 10.01-2.973 12.365.623.509.778.704-.429 4.166-4.55C83.462.88 86.914-.936 93.996 1.464c3.22 1.09 5.868 4.045 7.947 8.864 0 6.878 5.06 10.95 15.178 12.213 15.179 1.895 3.397 18.214-15.178 22.993-18.576 4.78-61.343 7.36-84.551-4.716C1.92 32.769 5.436 24.117 27.939 14.864z"
+          fill="url(#a)" opacity=".8"/>
+    <ellipse fill="url(#b)" cx="66" cy="69.166" rx="27.987" ry="6.478"/>
+    <path d="M113.25 77.249c-21.043 5.278-92.87-.759-100.515-3.516-3.721-1.343-7.075-3.868-10.061-7.576a2.822 2.822 0 0 1 2.198-4.593h125.514c2.605 6.938-3.107 12.166-17.136 15.685z"
+          fill="url(#c)" opacity=".675"/>
+    <g fill-rule="nonzero">
+      <path d="M43.396 12.098L33.825.906a2.434 2.434 0 0 0-1.837-.86h-20.58c-.706 0-1.377.324-1.837.86L0 12.098v6.144h43.396v-6.144z"
+            fill="url(#d)" transform="translate(44.08 39.707)"/>
+      <path d="M40.684 18.468L32.307 8.72a2.136 2.136 0 0 0-1.622-.725H12.711c-.617 0-1.22.256-1.622.725l-8.377 9.748v5.354h37.972v-5.354z"
+            fill="url(#e)" transform="translate(44.08 39.707)"/>
+      <path d="M43.396 25.283c0 .853-.384 1.62-.99 2.134l-.123.1a2.758 2.758 0 0 1-1.67.56H2.784c-.342 0-.669-.062-.971-.176l-.15-.06A2.802 2.802 0 0 1 0 25.282V12.165h10.529c1.163 0 2.1.957 2.1 2.118v.015c0 1.162.948 2.099 2.111 2.099h13.916a2.113 2.113 0 0 0 2.111-2.107c0-1.166.938-2.125 2.1-2.125h10.53z"
+            fill="url(#f)" transform="translate(44.08 39.707)"/>
     </g>
+  </g>
 </svg>