Merge pull request '卡片页面修复' (#37) from feature/cl into dev

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

pc4mobx/organization/components/NewWeaTableEditDialog.js

@@ -43,7 +43,6 @@ export default class NewWeaTableEditDialog extends React.Component {
             >
                 <WeaTableEdit
                     ecId={`${this && this.props && this.props.ecId || ""}_WeaTableEdit@7rorir`}
-                    draggable
                     deleteConfirm
                     title="模板"
                     showCopy={false}

pc4mobx/organization/components/department/NewPopconfirm.js

@@ -49,7 +49,11 @@ export default class NewPopconfirm extends React.Component {
         } = this.props, {
             value
         } = this.state;
-
+        form.updateFields({
+            moveType: {
+              value: this.state.value
+            }
+          });
         let arr = [];
         isFormInit && condition.map(c => {
             c.items.map((field, index) => {
@@ -88,12 +92,13 @@ export default class NewPopconfirm extends React.Component {
             onCancel,
             loading,
             height,
-            width
+            width,
+            form
         } = this.props
-
+        const a = form.getFormParams();
         const buttons = [
-            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => {save();this.setState({value:"0"})}} disabled={loading}>{i18n.button.ok()}</Button>),
+            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => {save();this.setState({value:form.getFormParams().moveType})}} disabled={loading}>{i18n.button.ok()}</Button>),
-            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => {this.setState({value:"0"});onCancel()}} disabled={loading}>{i18n.button.cancel()}</Button>)
+            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => {this.setState({value:form.getFormParams().moveType});onCancel()}} disabled={loading}>{i18n.button.cancel()}</Button>)
         ];
 
         return (

pc4mobx/organization/components/resource/IframeItem.js

@@ -23,7 +23,7 @@ export default class IframeItem extends React.Component {
 
     render() {
         const {
-            iframeInfo
+            iframeInfo,userid
         } = this.props, {
         } = this.state;
 
@@ -36,7 +36,7 @@ export default class IframeItem extends React.Component {
                 <div className='content' >
                   <iframe 
                     id={iframeInfo.id+"-iframe"}
-                    src={iframeInfo.url} 
+                    src={iframeInfo.url.replaceAll("{#id}",userid)} 
                     width="100%" 
                     height="500px" 
                     frameBorder="0" 

pc4mobx/organization/components/resource/ResourceCard.js

@@ -134,7 +134,12 @@ export default class ResourceCard extends React.Component {
     // }
 
     handleMenuClick = (e) => {
-        window.open(e.item.props.url,"_blank")
+        const {
+            resourceCard
+        } = this.props, {
+            data
+        } = resourceCard;
+        window.open(e.item.props.url.replaceAll("${id}",data.user.id),"_blank")
     }
 
     view = () => {
@@ -321,7 +326,7 @@ export default class ResourceCard extends React.Component {
                             {
                                 data.iframeList.map((item, index) => {
                                     return (
-                                        <IframeItem iframeInfo={item} />
+                                        <IframeItem iframeInfo={item} userid={data.user.ecId} />
                                     )
                                 })
                             }

pc4mobx/organization/stores/resource.js

@@ -379,7 +379,8 @@ export class ResourceStore {
             }).then(data => {
                 if (data.code === 200) {
                     this.customTemplateId = data.data;
-                    this.getSearchTemplate();
+                    this.getSearchTemplate(false);
+                    this.customization();
                     message.success(data.msg);
                 } else {
                     message.warning(data.msg);