feat: 同上

dist/_umi_route_preload_helper.496ad9df.js

@@ -0,0 +1 @@
+!function(){"use strict";var t="/".replace(/([^/])$/,"$1/"),e=location.pathname,n=e.startsWith(t)&&decodeURI("/".concat(e.slice(t.length)));if(n){var a=document,c=a.head,r=a.createElement.bind(a),i=function(t,e,n){var a,c=e.r[t]||(null===(a=Object.entries(e.r).find((function(e){var n=e[0];return new RegExp("^".concat(n.replace(/\/:[^/]+/g,"/[^/]+").replace("/*","/.+"),"$")).test(t)})))||void 0===a?void 0:a[1]);return null==c?void 0:c.map((function(t){var a=e.f[t][1],c=e.f[t][0];return{type:c.split(".").pop(),url:"".concat(n.publicPath).concat(c),attrs:[["data-".concat(e.b),"".concat(e.p,":").concat(a)]]}}))}(n,{"p":"ant-design-pro","b":"webpack","f":[["134.6fc81d91.async.js",134],["169.57647c7d.async.js",169],["p__Welcome.61596037.async.js",185],["t__plugin-layout__Layout.6cae69f5.chunk.css",301],["t__plugin-layout__Layout.4594a64b.async.js",301],["343.7ff141fb.async.js",343],["p__User__Login__index.9d3ab92e.async.js",366],["p__DeviceOwnerApp.c61abcd9.async.js",371],["390.41467286.async.js",390],["393.38316f72.async.js",393],["397.fb5f72c1.async.js",397],["p__SuperAdmin.497ff705.async.js",455],["p__Proxy__ProxyUserManagement.107b3f81.async.js",526],["531.35af34f5.async.js",531],["539.290aefb9.async.js",539],["p__AdvRecordListV2.c3403df7.async.js",542],["p__Bind.b6ee068f.async.js",557],["559.016bfdbb.async.js",559],["p__404.0c100574.async.js",571],["635.20e45f05.async.js",635],["p__App__AppManagement.463e3cde.async.js",731],["761.f7bbde11.async.js",761],["p__AdminManagement.3ee3c339.async.js",816],["841.614ef4c0.async.js",841],["p__AdvRecordList.fc092f59.async.js",857],["p__UserManagement.00a0e9d3.async.js",903],["905.6e225d1b.async.js",905],["930.fca7adbf.async.js",930],["p__Proxy__ProxyAdvRecordListV2.4cde70a4.async.js",990]],"r":{"/*":[18,26],"/":[0,3,4,17,19,26],"/welcome":[0,1,2,9,17,27,3,4,19,26],"/super":[0,1,5,11,13,14,26,27,3,4,17,19],"/adminList":[0,1,13,14,21,22,26,3,4,17,19],"/bind":[0,1,9,10,16,17,27,3,4,19,26],"/appList":[0,1,5,10,13,14,20,26,27,3,4,17,19],"/advList/:code":[0,1,13,14,17,23,24,26,27,3,4,19],"/advListV2/:code":[0,1,13,14,15,17,23,26,27,3,4,19],"/user/:code":[0,1,13,14,25,26,27,3,4,17,19],"/app/:code":[0,1,7,13,14,17,23,26,27,3,4,19],"/user/login":[0,1,6,13],"/proxy/advListV2/:code":[0,1,13,14,17,23,26,27,28,3,4,19],"/proxy/user/:code":[0,1,12,13,14,26,27,3,4,17,19]}},{publicPath:"/"});null==i||i.forEach((function(t){var e,n=t.type,a=t.url;if("js"===n)(e=r("script")).src=a,e.async=!0;else{if("css"!==n)return;(e=r("link")).href=a,e.rel="preload",e.as="style"}t.attrs.forEach((function(t){e.setAttribute(t[0],t[1]||"")})),c.appendChild(e)}))}}();

dist/_umi_route_preload_helper.7944206c.js

@@ -1 +0,0 @@
-!function(){"use strict";var t="/".replace(/([^/])$/,"$1/"),e=location.pathname,n=e.startsWith(t)&&decodeURI("/".concat(e.slice(t.length)));if(n){var a=document,c=a.head,r=a.createElement.bind(a),i=function(t,e,n){var a,c=e.r[t]||(null===(a=Object.entries(e.r).find((function(e){var n=e[0];return new RegExp("^".concat(n.replace(/\/:[^/]+/g,"/[^/]+").replace("/*","/.+"),"$")).test(t)})))||void 0===a?void 0:a[1]);return null==c?void 0:c.map((function(t){var a=e.f[t][1],c=e.f[t][0];return{type:c.split(".").pop(),url:"".concat(n.publicPath).concat(c),attrs:[["data-".concat(e.b),"".concat(e.p,":").concat(a)]]}}))}(n,{"p":"ant-design-pro","b":"webpack","f":[["51.a2ea1b3b.async.js",51],["134.6fc81d91.async.js",134],["169.57647c7d.async.js",169],["p__Welcome.61596037.async.js",185],["t__plugin-layout__Layout.6cae69f5.chunk.css",301],["t__plugin-layout__Layout.4594a64b.async.js",301],["343.7ff141fb.async.js",343],["p__User__Login__index.9d3ab92e.async.js",366],["p__DeviceOwnerApp.c61abcd9.async.js",371],["390.41467286.async.js",390],["393.38316f72.async.js",393],["397.fb5f72c1.async.js",397],["p__SuperAdmin.b23d2340.async.js",455],["p__Proxy__ProxyUserManagement.09105256.async.js",526],["531.4c68f902.async.js",531],["539.49b7b156.async.js",539],["p__AdvRecordListV2.bed7a82c.async.js",542],["p__Bind.b6ee068f.async.js",557],["559.016bfdbb.async.js",559],["p__404.0c100574.async.js",571],["635.20e45f05.async.js",635],["p__App__AppManagement.8c2eb6d0.async.js",731],["p__AdminManagement.aabf9f6f.async.js",816],["822.4ba8fa04.async.js",822],["841.614ef4c0.async.js",841],["p__AdvRecordList.fc092f59.async.js",857],["p__UserManagement.656d1839.async.js",903],["905.6e225d1b.async.js",905],["930.fca7adbf.async.js",930],["942.561ac28f.async.js",942],["p__Proxy__ProxyAdvRecordListV2.109e8e16.async.js",990]],"r":{"/*":[19,27],"/":[1,4,5,18,20,27],"/welcome":[1,2,3,10,18,28,4,5,20,27],"/super":[0,1,2,6,12,14,15,23,27,28,4,5,18,20],"/adminList":[0,1,2,22,23,29,4,5,18,20,27],"/bind":[1,2,10,11,17,18,28,4,5,20,27],"/appList":[0,1,2,6,11,14,15,21,23,27,28,4,5,18,20],"/advList/:code":[0,1,2,14,15,18,23,24,25,27,28,4,5,20],"/advListV2/:code":[0,1,2,14,15,16,18,23,24,27,28,4,5,20],"/user/:code":[0,1,2,14,15,23,26,27,28,4,5,18,20],"/app/:code":[0,1,2,8,14,15,18,23,24,27,28,4,5,20],"/user/login":[1,2,7,14,23],"/proxy/advListV2/:code":[0,1,2,14,15,18,23,24,27,28,30,4,5,20],"/proxy/user/:code":[0,1,2,13,14,15,23,27,28,4,5,18,20]}},{publicPath:"/"});null==i||i.forEach((function(t){var e,n=t.type,a=t.url;if("js"===n)(e=r("script")).src=a,e.async=!0;else{if("css"!==n)return;(e=r("link")).href=a,e.rel="preload",e.as="style"}t.attrs.forEach((function(t){e.setAttribute(t[0],t[1]||"")})),c.appendChild(e)}))}}();

dist/index.html

@@ -7,10 +7,10 @@
 <title>Ant Design Pro</title>
 <link rel="stylesheet" href="/umi.1ca9308c.css">
 <script async src="/scripts/loading.js"></script>
-<script src="/_umi_route_preload_helper.7944206c.js"></script>
+<script src="/_umi_route_preload_helper.496ad9df.js"></script>
 </head>
 <body>
 <div id="root"></div>
-<script src="/umi.c2ba8e98.js"></script>
+<script src="/umi.d661db3a.js"></script>
 </body>
 </html>

src/pages/App/AppBasicConfigForm.tsx

@@ -80,6 +80,7 @@ const AppBasicConfigForm: React.FC<AppBasicConfigFormProps> = (props) => {
               <Input />
             </Form.Item>
             <OSSUpload
+              url={props.appCode}
               onUploadSuccess={(url: string, file: File) => {
                 form.setFieldsValue({ url: url, fileSize: formatByte(file.size) });
               }}

src/pages/OSSUpload.tsx

@@ -8,9 +8,10 @@ import { getSts } from '../services/matrix/admin';
 interface OSSUploadProps {
   onUploadSuccess?: (fileUrl: string, file: File) => void;
   onUploadError?: (error: any) => void;
+  url?: string;
 }
 
-const OSSUpload: React.FC<OSSUploadProps> = ({ onUploadSuccess, onUploadError }) => {
+const OSSUpload: React.FC<OSSUploadProps> = ({ onUploadSuccess, onUploadError, url }) => {
   const [uploading, setUploading] = useState(false);
   const [ossClient, setOssClient] = useState<OSS | null>(null);
   const [fileList, setFileList] = useState<UploadFile[]>([]);
@@ -57,8 +58,15 @@ const OSSUpload: React.FC<OSSUploadProps> = ({ onUploadSuccess, onUploadError })
         },
       ]);
       try {
-        const md5 = await toMD5(file);
+        const suffix = file.name.split('.').pop();
-        const fileName = `matrix/${md5}.${file.name.split('.').pop()}`;
+        let fileName;
+        if (!url) {
+          const md5 = await toMD5(file);
+          fileName = `matrix/${md5}.${suffix}`;
+        } else {
+          fileName = `matrix/${url}.${suffix}`;
+        }
+
         await ossClient?.put(fileName, file, {
           headers: {
             'Content-Type': file.type,

src/pages/User/UserInfo.tsx

@@ -1,44 +1,71 @@
 import { Avatar, List, Popover, Row } from 'antd';
-import React from 'react';
+import React, { useState } from 'react';
 import { envMsg } from '../../utils/commonUtil';
+import LocalAppList from './LocalAppList';
 
 export type UserInfoProps = {
   data: API.UserBo;
 };
 
 const UserInfo: React.FC<UserInfoProps> = (props) => {
+  const [localAppVisible, setLocalAppVisible] = useState<boolean>(false);
+
   let msg = envMsg(props.data.env);
   return (
-    <Popover
+    <>
-      content={
+      <Popover
-        <>
+        content={
-          {msg.length > 0 && (
+          <>
-            <List
+            {props.data.localAppList && props.data.localAppList.length > 0 && (
-              size="small"
+              <p>
-              header={<div>设备异常信息</div>}
+                <label>已安装应用：</label>
-              //   footer={<div>Footer</div>}
+                {props.data.localAppList.length}个
-              bordered
+                <a
-              dataSource={msg}
+                  onClick={() => {
-              renderItem={(item) => <List.Item>{item}</List.Item>}
+                    setLocalAppVisible(true);
-            />
+                  }}
-          )}
+                  style={{ marginLeft: 20 }}
-        </>
+                >
-      }
+                  查看
-    >
+                </a>
-      <Row>
+              </p>
-        <Avatar
+            )}
-          src={
+            {msg.length > 0 && (
-            props.data.avatar ||
+              <List
-            'https://apks.bzgames.cn/matrix/fc3fca88a8b28ff602e7a38d8164938b.png'
+                size="small"
-          }
+                header={<div>设备异常信息</div>}
+                //   footer={<div>Footer</div>}
+                bordered
+                dataSource={msg}
+                renderItem={(item) => <List.Item>{item}</List.Item>}
+              />
+            )}
+          </>
+        }
+      >
+        <Row>
+          <Avatar
+            src={
+              props.data.avatar ||
+              'https://apks.bzgames.cn/matrix/fc3fca88a8b28ff602e7a38d8164938b.png'
+            }
+          />
+          <p style={{ fontSize: 12, marginLeft: 10, color: msg.length > 0 ? 'red' : '' }}>
+            id:{props.data.id}
+            <br />
+            {props.data.nickname || props.data.mobile}
+          </p>
+        </Row>
+      </Popover>
+      {localAppVisible && (
+        <LocalAppList
+          onClose={() => {
+            setLocalAppVisible(false);
+          }}
+          data={props.data}
         />
-        <p style={{ fontSize: 12, marginLeft: 10, color: msg.length > 0 ? 'red' : '' }}>
+      )}
-          id:{props.data.id}
+    </>
-          <br />
-          {props.data.nickname || props.data.mobile}
-        </p>
-      </Row>
-    </Popover>
   );
 };
 

src/services/matrix/typings.d.ts

@@ -142,6 +142,11 @@ declare namespace API {
     date?: string[];
   };
 
+  type LocalApp = {
+    appName?: string;
+    packageName?: string;
+  };
+
   type MatrixAdmin = {
     id?: number;
     name?: string;
@@ -195,6 +200,7 @@ declare namespace API {
     createdAt?: number;
     id?: number;
     ecpmReal?: number;
+    ecpmAdmin?: number;
     user?: UserBo;
     adminName?: string;
   };
@@ -518,6 +524,7 @@ declare namespace API {
     env?: number;
     status?: number;
     wxOpenId?: string;
+    localAppList?: LocalApp[];
     createdAt?: number;
   };