aldehyde 0.1.54 → 0.1.57

package/src/aldehyde/table/act-table.tsx

@@ -465,26 +465,30 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         // this.doCQuery(cqueryId, selectedRows[0])
     }
 
-    doJump = async (jumpId: string, selectedRows: SelectedRow[]) => {
-        const { sourceId} = this.props;
-        const {hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
-        let result: boolean = await HcserviceV3.postJumps( sourceId, jumpId, selectedRows);
-        if (result) {//重新加载数据
-            this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
+    doJump = async (jumpId: string, code: string) => {
+        // const { sourceId} = this.props;
+        // const {hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
+        let result = await HcserviceV3.postJumps(jumpId, code);
+
+        if (result.status === "success") {
+            let hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken");
+            let url = result.url + "hydrocarbon_token=" + Units.getLocalStorge("hydrocarbonToken");
+            console.log(url);
+            window.open(url);
         }
     }
 
     doRowJump = async (jumpId: string, code: string) => {
-        this.doJump(jumpId, [{title: undefined, code}])
+        this.doJump(jumpId, code);
     }
 
     doSelectedJump = async (jumpId: string) => {
         const {selectedRows} = this.state;
-        this.doJump(jumpId, selectedRows)
-    }
-
-
+        if(selectedRows.length==1){
+            this.doJump(jumpId, selectedRows[0].code)
+        }
 
+    }
 
     changeRowSelection = (selectedRows: SelectedRow[],selectedDatas:DtmplData[]) => {
         this.setState({

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -473,13 +473,12 @@ export default class HcserviceV3 {
         return res;
     }
 
-    static async postJumps(sourceId, jumpId, selectedRows:SelectedRow[]) {
-        const codes= this.getCodesOfSelectedRows(selectedRows);
+    static async postJumps(jumpId, code:string) {
         let res = await Super.super({
             url: `/v3/jump`,
             query: {
-                codes: codes,
-                 jumpId,
+                code,
+                sourceId:jumpId,
             },
             method: "GET",
         });

package/src/aldehyde/tmpl/interface.tsx

@@ -15,7 +15,7 @@ export type StatColType = 'fact' | 'dimension';
 export type ActTableViewModel = 'table' | 'verticalList' | 'horizontalList';
 
 export type ControlHolderType= 'table' | 'descriptions'
-export type PageType='modal'|'drawer';
+export type PageType='modal'|'drawer'|'card';
 export interface TmplBase {
     id: string;
     title: string;

package/src/aldehyde/welcome/HCWelcome.js

@@ -8,6 +8,7 @@ import TimePrograss from './img/time-prograss.png';
 import PainPoint from './img/pain-point.png';
 import Target from './img/target.png';
 import Development from './img/development.png';
+import DtmplEditCard from './../../aldehyde/detail/edit/dtmpl-edit-card';
 
 export default class HCWelcome extends React.Component {
     state = {}
@@ -223,6 +224,11 @@ export default class HCWelcome extends React.Component {
             </Row>
             </Col>
         </Row>
+            {/*<Row>*/}
+            {/*    <Col span={24}>*/}
+            {/*        <DtmplEditCard  code={'8999231441132377'} sourceId={'246909250609153'} ></DtmplEditCard>*/}
+            {/*    </Col>*/}
+            {/*</Row>*/}
             </>
     }