Merge pull request '细节修复' (#32) from feature/cl into dev

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/32

pc4mobx/organization/components/log/LogView.js

@@ -167,9 +167,9 @@ export default class LogView extends React.Component {
                     iconBgcolor="#217346"
                     visible={visible}
                     closable={true}
-                    hasScroll={true}
+                    hasScroll={false}
                     onCancel={() => onCancel()}
-                    style={{ height: height, width: width }}
+                    style={{ height: height, width: width}}
                     initLoadCss
                     className="logWrapper"
                 >
@@ -181,12 +181,15 @@ export default class LogView extends React.Component {
                         searchsAd={showSearchAd ? this.getPanelComponents() : <div></div>}
                         buttonsAd={this.getTabBtn()}
                     />
-                    <WeaTable ecId={`${this && this.props && this.props.ecId || ''}_WeaTable@pgmg3x`}
+                    <div style={{"padding":"0 10px 10px 10px"}}>
-                        comsWeaTableStore={tableStore}
+                        <WeaTable ecId={`${this && this.props && this.props.ecId || ''}_WeaTable@pgmg3x`}
-                        hasOrder={true}
+                            comsWeaTableStore={tableStore}
-                        needScroll={true}
+                            hasOrder={true}
-                        getColumns={c => this.reRenderColumns(c)}
+                            needScroll={true}
-                    />
+                            getColumns={c => this.reRenderColumns(c)}
+                        />
+                    </div>
+                   
                 </WeaDialog>
                 <WeaDialog ecId={`${this && this.props && this.props.ecId || ''}_WeaDialog@1txk5f`}
                     title={detailDialogTitle}

pc4mobx/organization/components/resource/resource.js

@@ -35,7 +35,7 @@ import {
     i18n
 } from '../../public/i18n';
 
-import '../../style/common.less';
+//import '../../style/common.less';
 
 import NewAndEditDialog from '../NewAndEditDialog';
 import { renderNoright } from '../../util';

pc4mobx/organization/stores/resource.js

@@ -514,7 +514,10 @@ export class ResourceStore {
     @action("模板") getSearchTemplate = (bool) => {
         Api.getSearchTemplate({ type: bool ? 'search' : 'custom' }).then(res => {
             if (res.code === 200) {
-                bool ? this.setTemplates(res.data) : this.setCustomTemplates(res.data);
+                if(res.data.templateId) {
+                    this.customTemplateId = res.data.templateId;
+                }
+                bool ? this.setTemplates(res.data.templates) : this.setCustomTemplates(res.data.templates);
             } else {
                 message.warning(res.msg);
             }

pc4mobx/organization/style/common.less

@@ -71,6 +71,7 @@
 
 }
 
+
 //日志弹框样式
 .logWrapper{
   .ant-table-body{
@@ -93,7 +94,7 @@
   .wea-table-indent {
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap;overflow: hidden;
+    white-space: nowrap;
   }
 
   //列定制
@@ -110,3 +111,8 @@
   //     float: right;
   //   }
   // }
+
+
+  
+
+ 

pc4mobx/organization/style/index.less

@@ -35,6 +35,26 @@ html {
   background-color: transparent;
 }
 
+//列表滚动条
+.wea-new-table {
+  ::-webkit-scrollbar {
+    width: 10px !important;
+    height: 10px !important;
+    background-color: transparent;
+  }
+  /*定义滚动条轨道 内阴影+圆角*/
+  ::-webkit-scrollbar-track {
+    -webkit-box-shadow: transparent;
+    background-color: transparent;
+  }
+  /*定义滑块 内阴影+圆角*/
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: none;
+    background-color: #ccc;
+  }
+}
+
 //自定义设置
 .fieldDef{
   width: 100%;