[add-description]：Dynamic change service

.gitignore

@@ -37,3 +37,5 @@ screenshots/
 
 # Locize settings
 .locize
+
+.history

package.json

@@ -43,7 +43,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "core-js": "^3.2.1"
+    "core-js": "^3.2.1",
+    "pdfjs-dist": "^2.2.228",
+    "react-transition-group": "^4.1.1",
+    "yarn": "^1.22.19"
   },
   "devDependencies": {
     "@babel/core": "^7.5.0",

platform/core/src/studies/index.js

@@ -1,3 +1,8 @@
+/*
+ * @Description:
+ * @Author: eleven
+ * @Date: 2022-11-21 21:23:56
+ */
 import { QIDO, WADO } from './services/';
 import {
   deleteStudyMetadataPromise,
@@ -9,18 +14,60 @@ import retrieveStudiesMetadata from './retrieveStudiesMetadata.js';
 import searchStudies from './searchStudies';
 import sortStudy from './sortStudy';
 
+
+// const retrieveStudiesMetadata = (server, ...res) => {
+//   let serve = JSON.parse(localStorage.getItem('serve'))
+//   console.log('serve12333r: ', serve);
+//   if (serve !== undefined || serve !== {}) {
+//     server = { ...server, ...serve }
+//   }
+//   return retrieveStudiesMetadatas(server, ...res)
+// }
+
+export const changeServe = (object) => {
+
+  let list = Object.keys(object)
+
+  let res = list.reduce((pre, item) => {
+    let midFn = object[item]
+    console.log('midFn: ', midFn);
+    Object.defineProperty(object, [item], {
+      value: function (...arg) {
+        let [server, ...params] = arg
+        if (server) {
+          let serve = JSON.parse(localStorage.getItem('serve'))
+          if (!serve || JSON.stringify(serve) !== "{}") {
+            server = { ...server, ...serve }
+            params = [server, ...params]
+          }
+        }
+        midFn(...params)
+      }
+    })
+    pre[item] = object[item]
+    return pre
+  }, {})
+  return res
+}
+
+let serveApi = {
+  retrieveStudyMetadata,
+  deleteStudyMetadataPromise,
+  retrieveStudiesMetadata,
+
+}
+let serveApiExport = changeServe(serveApi)
+
 const studies = {
   services: {
     QIDO,
     WADO,
   },
   loadingDict: {},
-  retrieveStudyMetadata,
-  deleteStudyMetadataPromise,
-  retrieveStudiesMetadata,
-  getStudyBoxData,
   searchStudies,
   sortStudy,
+  getStudyBoxData,
+  ...serveApiExport
 };
 
 export default studies;

platform/core/src/studies/services/index.js

@@ -1,15 +1,24 @@
+/*
+ * @Description:
+ * @Author: eleven
+ * @Date: 2022-11-21 21:26:10
+ */
 // DICOMWeb instance, study, and metadata retrieval
 import Instances from './qido/instances.js';
 import Studies from './qido/studies.js';
 import RetrieveMetadata from './wado/retrieveMetadata.js';
 
-const WADO = {
+
+let WADO = {
   RetrieveMetadata,
 };
 
-const QIDO = {
+let QIDO = {
   Studies,
   Instances,
 };
 
+
+
+
 export { QIDO, WADO };

platform/core/src/studies/services/qido/instances.js

@@ -16,7 +16,7 @@ function resultDataToStudyMetadata(server, StudyInstanceUID, resultData) {
   const seriesMap = {};
   const series = [];
 
-  resultData.forEach(function(instance) {
+  resultData.forEach(function (instance) {
     // Use seriesMap to cache series data
     // If the series instance UID has already been used to
     // process series data, continue using that series
@@ -77,7 +77,11 @@ function resultDataToStudyMetadata(server, StudyInstanceUID, resultData) {
  */
 export default function Instances(server, StudyInstanceUID) {
   // TODO: Are we using this function anywhere?? Can we remove it?
-
+  let serve = JSON.parse(localStorage.getItem('serve'))
+  console.log('server: ', serve);
+  if (serve !== undefined || serve !== {}) {
+    server = { ...server, ...serve }
+  }
   const config = {
     url: server.qidoRoot,
     headers: DICOMWeb.getAuthorizationHeader(server),

platform/core/src/studies/services/qido/studies.js

@@ -4,7 +4,7 @@ import DICOMWeb from '../../../DICOMWeb/';
 
 import errorHandler from '../../../errorHandler';
 import getXHRRetryRequestHook from '../../../utils/xhrRetryRequestHook';
-
+import { changeURL } from '../index'
 /**
  * Creates a QIDO date string for a date range query
  * Assumes the year is positive, at most 4 digits long.
@@ -115,8 +115,19 @@ function resultDataToStudies(resultData) {
   return studies;
 }
 
-export default function Studies(server, filter) {
+
+
+
+
+function Studies(server, filter) {
   const { staticWado } = server;
+
+  let serve = JSON.parse(localStorage.getItem('serve'))
+  console.log('server: ', serve);
+  if (serve !== undefined || serve !== {}) {
+    server = { ...server, ...serve }
+  }
+
   const config = {
     ...server,
     url: server.qidoRoot,
@@ -125,6 +136,8 @@ export default function Studies(server, filter) {
     requestHooks: [getXHRRetryRequestHook()],
   };
 
+  console.log('config: ', config);
+
   const dicomWeb = staticWado
     ? new StaticWadoClient(config)
     : new api.DICOMwebClient(config);
@@ -142,3 +155,5 @@ export default function Studies(server, filter) {
 
   return dicomWeb.searchForStudies(options).then(resultDataToStudies);
 }
+
+export default Studies

platform/ui/package.json

@@ -57,7 +57,7 @@
     "react-i18next": "^10.11.0",
     "react-modal": "^3.11.1",
     "react-overlays": "^0.8.0",
-    "react-transition-group": "2.0.0",
+    "react-transition-group": "^2.0.0",
     "react-with-direction": "1.3.0"
   },
   "devDependencies": {

platform/ui/src/contextProviders/SnackbarProvider.js

@@ -31,20 +31,6 @@ const SnackbarProvider = ({ children, service }) => {
   const [count, setCount] = useState(1);
   const [snackbarItems, setSnackbarItems] = useState([]);
 
-  useEffect(() => {
-    const onLogHandler = ({ type, notify, title, message }) => {
-      if (notify) {
-        show({ type, title, message });
-      }
-    };
-
-    LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler);
-
-    return () => {
-      LogManager.unsubscribe(LogManager.EVENTS.OnLog, onLogHandler);
-    };
-  }, [show]);
-
   const show = useCallback(
     options => {
       if (!options || (!options.title && !options.message)) {
@@ -72,6 +58,22 @@ const SnackbarProvider = ({ children, service }) => {
     [count, DEFAULT_OPTIONS]
   );
 
+  useEffect(() => {
+    const onLogHandler = ({ type, notify, title, message }) => {
+      if (notify) {
+        show({ type, title, message });
+      }
+    };
+
+    LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler);
+
+    return () => {
+      LogManager.unsubscribe(LogManager.EVENTS.OnLog, onLogHandler);
+    };
+  }, [show]);
+
+
+
   const hide = useCallback(
     id => {
       const hideItem = items => {

platform/viewer/.webpack/webpack.pwa.js

@@ -46,7 +46,7 @@ module.exports = (env, argv) => {
       path: DIST_DIR,
       filename: isProdBuild ? '[name].bundle.[chunkhash].js' : '[name].js',
       publicPath: PUBLIC_URL, // Used by HtmlWebPackPlugin for asset prefix
-      devtoolModuleFilenameTemplate: function(info) {
+      devtoolModuleFilenameTemplate: function (info) {
         if (isProdBuild) {
           return `webpack:///${info.resourcePath}`;
         } else {
@@ -180,9 +180,23 @@ module.exports = (env, argv) => {
 
   if (hasProxy) {
     mergedConfig.devServer.proxy = {};
-    mergedConfig.devServer.proxy[PROXY_TARGET] = PROXY_DOMAIN;
+    // mergedConfig.devServer.proxy[PROXY_TARGET] = PROXY_DOMAIN;
+    mergedConfig.devServer.proxy["/10.10.99.88:8042/dicom-web"] = {
+      target: 'http://10.10.99.88:8042/dicom-web',
+      changeOrigin: true,//控制服务器收到的请求头中Host的值
+      pathRewrite: { '^/10.10.99.88:8042/dicom-web': '' } //重写请求路径，下面有示例解释
+    }
+    mergedConfig.devServer.proxy["/10.10.99.8:8042/dicom-web"] = {
+      target: 'http://10.10.99.8:8042/dicom-web',
+      changeOrigin: true,//控制服务器收到的请求头中Host的值
+      pathRewrite: { '^/10.10.99.8:8042/dicom-web': '' } //重写请求路径，下面有示例解释
+    }
+
+    console.log('mergedConfig.devServer.proxy: ', mergedConfig.devServer.proxy);
   }
 
+
+
   if (!isProdBuild) {
     mergedConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
   }

platform/viewer/package.json

@@ -23,7 +23,7 @@
     "build:viewer:demo": "cross-env NODE_ENV=production APP_CONFIG=config/demo.js HTML_TEMPLATE=rollbar.html QUICK_BUILD=true node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --progress --config .webpack/webpack.pwa.js",
     "build:viewer:package": "yarn run build:package",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js",
-    "dev:orthanc": "cross-env NODE_ENV=development PROXY_TARGET=/dicom-web PROXY_DOMAIN=http://localhost:8042 APP_CONFIG=config/docker_nginx-orthanc.js webpack-dev-server --config .webpack/webpack.pwa.js",
+    "dev:orthanc": "cross-env NODE_ENV=development PROXY_TARGET=/dicom-web PROXY_DOMAIN=http://10.10.99.8:8042 APP_CONFIG=config/docker_nginx-orthanc.js webpack-dev-server --config .webpack/webpack.pwa.js",
     "dev:viewer": "yarn run dev",
     "start": "yarn run dev",
     "test:e2e": "cypress open",

platform/viewer/public/config/default.js

@@ -1,3 +1,8 @@
+/*
+ * @Description:
+ * @Author: eleven
+ * @Date: 2022-11-21 21:23:57
+ */
 window.config = {
   // default: '/'
   routerBasename: '/',

platform/viewer/public/config/docker_nginx-orthanc.js

@@ -1,13 +1,23 @@
+/*
+ * @Description:
+ * @Author: zhenglong
+ * @Date: 2022-11-21 21:23:57
+ */
+
+
 window.config = {
   routerBasename: '/',
   showStudyList: true,
   servers: {
     dicomWeb: [
       {
         name: 'Orthanc',
-        wadoUriRoot: '/wado',
-        qidoRoot: '/dicom-web',
-        wadoRoot: '/dicom-web',
+        wadoUriRoot: '/10.10.99.88:8042/wado',
+        qidoRoot: '/10.10.99.88:8042/dicom-web',
+        wadoRoot: '/10.10.99.88:8042/dicom-web',
+        // wadoUriRoot: 'http://10.10.99.8:8042/wado',
+        // qidoRoot: 'http://10.10.99.8:8042/dicom-web',
+        // wadoRoot: 'http://10.10.99.8:8042/dicom-web',
         qidoSupportsIncludeField: false,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',