@jiangood/open-admin 2.2.9 → 2.3.1

package/package.json

@@ -36,5 +36,5 @@
     "dev": "umi dev",
     "build": "umi build"
   },
-  "version": "2.2.9"
+  "version": "2.3.1"
 }

package/src/.umi-production/appData.json

@@ -38,7 +38,7 @@
       "dev": "umi dev",
       "build": "umi build"
     },
-    "version": "2.2.9"
+    "version": "2.3.1"
   },
   "pkgPath": "/home/runner/work/open-admin/open-admin/web/package.json",
   "plugins": {
@@ -115,7 +115,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -128,7 +128,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -142,7 +142,7 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            59
+            62
           ]
         },
         "register": 21
@@ -583,7 +583,7 @@
       "enableBy": "register",
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "virtual: config-runtimePublicPath": {
@@ -1094,7 +1094,7 @@
             1
           ]
         },
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1120,7 +1120,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 94
+        "register": 97
       },
       "enableBy": "register"
     },
@@ -1133,7 +1133,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 27
+        "register": 28
       },
       "enableBy": "config"
     },
@@ -1146,7 +1146,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 8
+        "register": 9
       },
       "enableBy": "config"
     },
@@ -1160,10 +1160,10 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            0
+            1
           ]
         },
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1176,7 +1176,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1227,7 +1227,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/overrides/overrides": {
@@ -1239,7 +1239,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1252,7 +1252,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1281,7 +1281,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1384,7 +1384,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "config"
     },
@@ -1397,7 +1397,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1423,7 +1423,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 3
       },
       "enableBy": "config"
     },
@@ -1436,7 +1436,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1461,7 +1461,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 22
+        "register": 21
       },
       "enableBy": "config"
     },
@@ -1540,7 +1540,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1578,7 +1578,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/hmrGuardian/hmrGuardian": {
@@ -1602,7 +1602,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 26
+        "register": 28
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/forget/forget": {
@@ -1653,7 +1653,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 43
+        "register": 45
       },
       "enableBy": "register"
     },
@@ -1743,7 +1743,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1834,7 +1834,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1886,7 +1886,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1899,7 +1899,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1912,7 +1912,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 22
+        "register": 21
       },
       "enableBy": "register"
     },
@@ -1925,7 +1925,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1968,7 +1968,7 @@
             0
           ]
         },
-        "register": 7
+        "register": 6
       },
       "enableBy": "register"
     }

package/src/framework/components/index.ts

@@ -1,4 +1,3 @@
-export * from './ProModal'
 export * from './system'
 export * from './PageLoading'
 export * from './ProTable'

package/src/framework/views/ViewImage/index.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import {Modal} from 'antd';
+import {SysUtils} from '../../utils';
 
 
 export class ViewImage extends React.Component {
@@ -19,17 +20,18 @@ export class ViewImage extends React.Component {
     for (let v of vs) {
       const isId = v.indexOf('/') === -1;
       const isAbsUrl = v.startsWith('http');
-      if (isAbsUrl) {
+      const isDataUrl = v.startsWith('data:');
+      if (isAbsUrl || isDataUrl) {
         urlList.push(v);
         continue;
       }
 
       if (isId) {
-        urlList.push( 'admin/sysFile/preview/' + v);
+        urlList.push(SysUtils.contextPath('/admin/sysFile/preview/' + v));
         continue;
       }
 
-      urlList.push( v);
+      urlList.push(SysUtils.contextPath(v));
     }
 
     const imgs = urlList.map((url) => (

package/src/framework/components/ProModal/index.tsx

@@ -1,66 +0,0 @@
-import React, {ReactNode} from 'react';
-import {Modal} from 'antd';
-
-export interface ProModalProps {
-  title: string;
-  actionRef?: any; // 弃用，请使用ref
-  ref: any;
-  onShow?: any;
-  footer?: any;
-  width?: number;
-  children:ReactNode;
-}
-export class ProModal extends React.Component<ProModalProps, any> {
-
-  constructor(props:ProModalProps) {
-    super(props);
-    if (props.actionRef) {
-      props.actionRef.current = this;
-    }
-    if (props.ref) {
-      props.ref.current = this;
-    }
-  }
-
-
-
-  state = {
-    visible: false,
-  };
-
-  show = () => {
-    this.setState({
-      visible: true,
-    });
-    if (this.props.onShow) {
-      this.props.onShow();
-    }
-  };
-  hide = () => {
-    this.setState({
-      visible: false,
-    });
-  };
-  open = () => {
-    this.show();
-  };
-  close = () => {
-    this.hide();
-  };
-
-  render() {
-    return (
-      <Modal
-        mask={{ closable: false }}
-        destroyOnHidden
-        title={this.props.title}
-        open={this.state.visible}
-        onCancel={this.hide}
-        footer={this.props.footer || null}
-        width={this.props.width || 800}
-      >
-        {this.state.visible && this.props.children}
-      </Modal>
-    );
-  }
-}