Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

example/Unknown.js

+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+const Unknown = props => {
+  const { className } = props;
+  const cls = classNames('sketch-component-unknown', className);
+  return (
+    <div className={cls}>未知控件</div>
+  );
+};
+
+Unknown.propTypes = {
+  className: PropTypes.string
+};
+
+export default Unknown;

example/sketch.js

-import { commonRegister } from 'amos-viz/lib/widgets';
-import { getSketchCompnents } from './../mods';
+import { IModularHub, INNER_MODULAR_TYPE } from 'amos-viz/lib/widgets';
+import Unknown from './Unknown';
+import * as mods from './../mods';
+// 测试发布
+// import * as mods from './../lib/graphmod';
 
-const innerModularType = commonRegister.innerModularType;
+/**
+ * hybrid 创建自己独立的 modular
+ * 注册 所有的 mod
+ */
+export const hybridModular = new IModularHub();
+
+// 注册未知组件
+hybridModular.registerSketchComponent('unknown', Unknown);
+
+Object.keys(mods).forEach(k => {
+  // 需要排除 default
+  if (k !== 'default'){
+    hybridModular.registerSketchComponent(k, mods[k]);
+  }
+});
 
 export function getComponentKeyList(){
-  return Object.keys(commonRegister.getModularsByType(innerModularType.sketchComponent));
+  const sc = hybridModular.getModularsByType(INNER_MODULAR_TYPE.sketchComponent);
+  // const sc = hybridModular.getObjModularsByType(INNER_MODULAR_TYPE.sketchComponent);
+  return [...sc.keys()].map(item => item.replace(`${INNER_MODULAR_TYPE.sketchComponen}/`, ''));
 }
 
-export default getSketchCompnents;
+export default function getSketchCompnents(alias){
+  return hybridModular.getModularClass(INNER_MODULAR_TYPE.sketchComponent, alias, Unknown);
+}

mods/components/3dviewConvertor/services/3dService.js

@@ -26,7 +26,14 @@ export const getObjFromNet = (url, callback) => {
  * @param {string} type
  */
 export const initView3DAction = (type,riskSourceId) => {
-  const url = formatUrl(FscSerUrl.view3dInitUrl, { type, riskSourceId });
+  let param = {};
+  if (riskSourceId) {
+    param = { type, riskSourceId };
+  }
+  else {
+    param = { type };
+  }
+  const url = formatUrl(FscSerUrl.view3dInitUrl, param);
   return commonGet(url);
 };
 

mods/components/3dviewConvertor/styles/pointsDetails.scss

@@ -159,7 +159,11 @@
   width: 100%;
   height: 100%;
   .amos-modal-container{
-    // width: 310px !important;
+    background-image: url('./../assets/convertor/3dview/toolmodalbg.png');
+    background-repeat: no-repeat;
+    height:262px;
+    width: 452px !important;
+    background-color: rgba(255,255,255,0);
     .amos-modal-close{
       color: white;
       background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
@@ -170,36 +174,43 @@
       }
     }
     .amos-modal-header{
-      background: $model-header-color-3d;
-      height: 30px;
+      background: rgba(255,255,255,0);
+      height: 50px;
       padding: 0;
+      border-width: 0em;
       .amos-modal-title{
-        line-height: 30px;
+        line-height: 50px;
         padding-left: 9px;
-
+        color: #fff;
+        font-size: 18px;
       }
     }
     .amos-modal-content{
       padding: 0;
       .point-dialog-body{
+        margin:10px;
+        max-height: 180px;
+        color: #fff;
         .point-dialog-modal-row {
+          border: solid 1px rgba(234, 234, 234, 0.3);
           display: flex;
-          background: $model-body-color-3d;
+          background: transparent;
           .colTitle {
             float: left;
             font-weight: bold;
             height: 40px;
             padding-left: 8px;
-            border-left: 1px solid $core-border-color;
+            line-height: 40px;
             box-sizing: border-box;
             flex: 1;
+            background-color: rgba(25, 86, 147, 0.6);
           }
           .colValue {
             float: left;
             height: 40px;
             padding-left: 8px;
-            flex: 1;
-            border-left: 1px solid $core-border-color;
+            line-height: 40px;
+            flex: 1.5;
           }
         }
       }
@@ -214,7 +225,7 @@
     height: 8px;
   }
   ::-webkit-scrollbar-thumb {           /* 拖动条 */
-    background-image: url('./../assets/convertor/3dview/control-track.png') ;
+    background-image: url('./../assets/convertor/3dview/scrollslider.png') ;
     background-repeat: no-repeat;
     height: 10px;
   }
@@ -222,13 +233,13 @@
     background-color:rgba(17, 44, 88, 0.2);
   }
   ::-webkit-scrollbar-button{
-
-    background-image: url('./../assets/convertor/3dview/control-track.png') ;
+    background-image: url('./../assets/convertor/3dview/scrollbutton.png') ;
+    background-repeat: no-repeat;
   }
 
    height:100%;
   .amos-modal-container{
-    background-image: url('./../assets/convertor/3dview/modalbg.png');
+     background-image: url('./../assets/convertor/3dview/modalbg.png');
      height:497px;
      width: 866px !important;
      background-color: rgba(255,255,255,0);

mods/components/3dviewConvertor/view/common/tableComponent/table/AmosGridTable.js

@@ -238,8 +238,7 @@ class AmosGridTable extends Component {
 
               rowSelection={rowSelection}
               columns={columns}
-              //dataSource={dataList}
-              dataSource={[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}]}
+              dataSource={dataList}
               pagination={_pagination}
               size={size}
               bordered={bordered}

mods/components/3dviewConvertor/view/points/dialogModel/FireEquipmentModal.js

@@ -47,8 +47,8 @@ class FireEquipmentModal extends Component {
             <Col className="colTitle">安装位置：</Col>
             <Col className="colValue">{position}</Col>
           </Row>
-        </Row> 
-      );  
+        </Row>
+      );
     }else {
       return (
         <Row className="point-dialog-body">

mods/index.js

 import parseWidgetsMod from 'amos-viz/lib/widgets/modLoader';
-import { commonRegister } from 'amos-viz/lib/widgets';
-import Unknown from './Unknown';
 
-const innerModularType = commonRegister.innerModularType;
 
 const getMods = (req) => {
   return parseWidgetsMod(req, true);
 };
 
-// 注册未知组件
-commonRegister.registerSketchComponent('unknown', Unknown);
-
 // 注册所有的 SketchComponent
 const scReq = require.context('./components', true, /^\.\/([^_][\w-]+\/)+index\.(js|jsx)?$/);
-const sketchComponets = getMods(scReq);
-Object.keys(sketchComponets).forEach(k => {
-  commonRegister.registerSketchComponent(k, sketchComponets[k]);
-});
 
-export function getSketchCompnents(alias){
-  return commonRegister.getModularClass(innerModularType.sketchComponent, alias, Unknown);
-}
+const mods = getMods(scReq);
+
+Object.keys(mods).forEach(mk => {
+  if (mk !== 'default'){
+    exports[mk] = mods[mk];
+  }
+});