aldehyde 0.2.43 → 0.2.45

package/lib/controls/file-view/drawer-file-view.d.ts

@@ -2,14 +2,14 @@ import * as React from 'react';
 import { FileValue } from "../../tmpl/interface";
 interface DrawerFileViewProps {
     file: FileValue;
-    downloadAble?: boolean;
+    downloadable?: boolean;
 }
 interface DrawerFileViewState {
     drawerOpen?: boolean;
 }
 export default class DrawerFileView extends React.PureComponent<DrawerFileViewProps, DrawerFileViewState> {
     static defaultProps: {
-        downloadAble: boolean;
+        downloadable: boolean;
     };
     state: {
         drawerOpen: boolean;

package/lib/controls/file-view/drawer-file-view.js

@@ -30,18 +30,18 @@ class DrawerFileView extends React.PureComponent {
         console.log(e, 'error in file-viewer');
     }
     render() {
-        const { file, downloadAble } = this.props;
+        const { file, downloadable } = this.props;
         const { drawerOpen } = this.state;
         return React.createElement("span", { className: 'labelcss' },
             React.createElement(Button, { type: 'link', onClick: () => {
                     this.setState({ drawerOpen: true });
                 }, size: "small" }, file.base.fileName),
-            downloadAble ? React.createElement(Button, { type: 'text', onClick: () => __awaiter(this, void 0, void 0, function* () {
+            downloadable ? React.createElement(Button, { type: 'text', onClick: () => __awaiter(this, void 0, void 0, function* () {
                     yield HCService.download(file.base.path);
                 }), size: "small" },
                 React.createElement(DownloadOutlined, null)) : null,
             drawerOpen ? React.createElement(Drawer, { title: file.base.fileName, placement: 'left', closable: false, onClose: this.onClose, width: '1200px', open: drawerOpen, extra: React.createElement(Space, null,
-                    downloadAble ? React.createElement(Button, { onClick: () => __awaiter(this, void 0, void 0, function* () {
+                    downloadable ? React.createElement(Button, { onClick: () => __awaiter(this, void 0, void 0, function* () {
                             yield HCService.download(file.base.path);
                         }) },
                         React.createElement(DownloadOutlined, null)) : null,
@@ -51,7 +51,7 @@ class DrawerFileView extends React.PureComponent {
     }
 }
 DrawerFileView.defaultProps = {
-    downloadAble: false,
+    downloadable: true,
 };
 export default DrawerFileView;
 //# sourceMappingURL=drawer-file-view.js.map

package/lib/controls/file-view/drawer-file-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawer-file-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/drawer-file-view.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"drawer-file-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/drawer-file-view.tsx"],"names":[],"mappings":"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"}

package/lib/controls/file-view/index.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { FieldConfig } from "../../tmpl/interface";
 interface FileViewProps {
     fieldConfig: FieldConfig;
-    downloadAble?: boolean;
+    downloadable?: boolean;
     value: any;
     width?: number;
     height?: number;
@@ -12,7 +12,7 @@ interface FileViewState {
 }
 export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {
     static defaultProps: {
-        downloadAble: boolean;
+        downloadable: boolean;
     };
     state: {
         urlData: any;

package/lib/controls/file-view/index.js

@@ -44,7 +44,7 @@ class FileView extends React.PureComponent {
         };
         this.packFile2Show = (file) => {
             const { urlData } = this.state;
-            const { downloadAble } = this.props;
+            const { downloadable } = this.props;
             let jsonFile = this.getJsonValue(file);
             if (jsonFile) {
                 if ("new" == jsonFile.valid) {
@@ -86,20 +86,20 @@ class FileView extends React.PureComponent {
                     //         errorComponent={undefined}
                     //         onError={this.onError}/>
                     //   </span>
-                    return React.createElement(DrawerFileView, { file: jsonFile, downloadAble: downloadAble });
+                    return React.createElement(DrawerFileView, { file: jsonFile, downloadable: downloadable });
                 }
                 else if (['pdf', 'txt'].includes(jsonFile.base.type)) {
                     return React.createElement("span", { className: 'labelcss' },
                         React.createElement(Button, { type: 'link', onClick: () => __awaiter(this, void 0, void 0, function* () {
-                                yield HCService.openfile(jsonFile.base.path, downloadAble ? "" : '#toolbar=0');
+                                yield HCService.openfile(jsonFile.base.path, downloadable ? "" : '#toolbar=0');
                             }), size: "small" }, jsonFile.base.fileName),
-                        downloadAble ? React.createElement(Button, { type: 'text', onClick: () => __awaiter(this, void 0, void 0, function* () {
+                        downloadable ? React.createElement(Button, { type: 'text', onClick: () => __awaiter(this, void 0, void 0, function* () {
                                 yield HCService.download(jsonFile.base.path);
                             }), size: "small" },
                             React.createElement(DownloadOutlined, null)) : null);
                 }
                 else {
-                    return React.createElement(Space, { className: 'labelcss' }, downloadAble ? React.createElement(React.Fragment, null,
+                    return React.createElement(Space, { className: 'labelcss' }, downloadable ? React.createElement(React.Fragment, null,
                         React.createElement(Button, { type: 'link', onClick: () => __awaiter(this, void 0, void 0, function* () {
                                 yield HCService.download(jsonFile.base.path);
                             }), size: "small" }, jsonFile.base.fileName),
@@ -130,7 +130,7 @@ class FileView extends React.PureComponent {
     }
 }
 FileView.defaultProps = {
-    downloadAble: false,
+    downloadable: true,
 };
 export default FileView;
 //# sourceMappingURL=index.js.map

package/lib/controls/file-view/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/file-view/index.tsx"],"names":[],"mappings":"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"}

package/lib/controls/upload/index.js

@@ -79,7 +79,7 @@ export default class Upload extends React.PureComponent {
                     uid: '-1',
                     name: value_1.base.fileName,
                     status: 'done',
-                    url: Units.api() + '/v3/files' + value_1.base.path + `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
+                    url: Units.joinPath(Units.joinPath(Units.api(), '/v3/files'), value_1.base.path) + `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
                 });
             }
             else if (value_1.valid == 'new') {

package/lib/controls/upload/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/upload/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,MAAM,EAAE,MAAM,IAAI,UAAU,EAAE,OAAO,EAAQ,MAAM,MAAM,CAAA;AACjE,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AACjD,OAAO,WAAW,MAAM,2BAA2B,CAAA;AAEnD,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAE1C,OAAO,KAAK,MAAM,aAAa,CAAA;AAU/B,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,KAAK,CAAC,aAAuC;IAAjF;;QAEI,UAAK,GAAC,EAEL,CAAA;QAED,yBAAyB;QACzB,sBAAsB;QACtB,yBAAyB;QACzB,iCAAiC;QACjC,wBAAwB;QACxB,4BAA4B;QAC5B,wBAAwB;QACxB,gCAAgC;QAChC,qEAAqE;QACrE,aAAa;QACb,4BAA4B;QAC5B,4BAA4B;QAC5B,YAAY;QACZ,UAAU;QACV,EAAE;QACF,oBAAoB;QACpB,IAAI;QACJ,iBAAY,GAAC,CAAC,IAAI,EAAC,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAA;QACC,iBAAY,GAAE,CAAO,IAAI,EAAC,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,cAAc,EAAC,IAAI,CAAC,CAAC;YAEjC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAE,MAAM,EAAC;gBACzB,IAAI,OAAO,GAAW;oBAClB,KAAK,EAAC,KAAK;oBACX,OAAO,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO;oBAClC,QAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI;iBACxC,CAAA;gBACD,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAA;gBAC7B,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;aACrC;QACL,CAAC,CAAA,CAAA;QACD,sCAAsC;QACtC,8BAA8B;QAC9B,sBAAsB;QACtB,gCAAgC;QAChC,QAAQ;QACR,MAAM;QAEN,iBAAY,GAAC,CAAC,IAAI,EAAC,EAAE;YAEjB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;gBAC/B,OAAO,KAAK,CAAA;aACf;iBAAI;gBACD,OAAO,IAAI,CAAA;aACd;QAEL,CAAC,CAAA;IAgDL,CAAC;IA9CG,MAAM;QACF,MAAM,EAAC,EAAE,EAAC,QAAQ,EAAC,QAAQ,EAAC,KAAK,EAAC,GAAC,IAAI,CAAC,KAAK,CAAA;QAC7C,IAAI,QAAQ,GAAc,EAAE,CAAC;QAC7B,IAAG,KAAK,EAAC;YACL,IAAI,OAAO,GAAW,KAAK,CAAC;YAC5B,IAAG,OAAO,OAAO,IAAE,QAAQ,EAAC;gBACxB,OAAO,GAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAC7B;YACD,IAAG,OAAO,CAAC,KAAK,KAAG,IAAI,EAAC;gBACpB,QAAQ,CAAC,IAAI,CAAE;oBACX,GAAG,EAAE,IAAI;oBACT,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;oBAC3B,MAAM,EAAE,MAAM;oBACd,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAC,WAAW,GAAC,OAAO,CAAC,IAAI,CAAC,IAAI,GAAC,WAAW,KAAK,CAAC,gBAAgB,EAAE,kBAAkB,KAAK,CAAC,WAAW,EAAE,yBAAyB;iBACnJ,CAAC,CAAA;aACL;iBAAK,IAAG,OAAO,CAAC,KAAK,IAAE,KAAK,EAAC;gBAC1B,QAAQ,CAAC,IAAI,CAAC;oBACV,GAAG,EAAE,IAAI;oBACT,IAAI,EAAE,OAAO,CAAC,QAAQ;iBACzB,CAAC,CAAC;aACN;SACJ;QAED,OAAO,CACH;YACI,oBAAC,UAAU,IAAC,EAAE,EAAE,EAAE,EACd,QAAQ,EAAE,CAAC,EACX,MAAM,EAAE,QAAQ,KAAG,SAAS,CAAA,CAAC,CAAA,mBAAmB,CAAA,CAAC,CAAA,QAAQ,KAAG,OAAO,CAAA,CAAC,CAAA,MAAM,CAAA,CAAC,CAAA,SAAS,EACpF,QAAQ,EAAE,QAAQ,IAAG,SAAS,CAAA,CAAC,CAAA,SAAS,CAAA,CAAC,CAAA,MAAM,EAC/C,QAAQ,EAAE,QAAQ,CAAC,MAAM,IAAE,CAAC,CAAA,CAAC,CAAA,SAAS,CAAA,CAAC,CAAA,QAAQ,EAC/C,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,KAAK,CAAC,YAAY,EAAE,EAC7B,MAAM,EAAE,WAAW,CAAC,cAAc,EAClC,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,QAAQ,EAAE,IAAI,CAAC,YAAY,IAE9B,QAAQ,IAAI,QAAQ,CAAC,MAAM,IAAE,CAAC,CAAA,CAAC,CAAA,EAAE,CAAA,CAAC;gBAC/B,oBAAC,MAAM,IAAE,QAAQ,EAAE,QAAQ;oBACvB,oBAAC,cAAc,OAAG;;oBAAE,QAAQ,CAAA,CAAC,CAAA,MAAM,CAAA,CAAC,CAAA,MAAM,CACrC,CACA,CACX,CACT,CAAA;IACL,CAAC;CACJ"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/upload/index.tsx"],"names":[],"mappings":"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"}

package/lib/controls/view-control.js

@@ -130,7 +130,7 @@ function renderControl(fieldConfig, fieldValue, pHolderType, width) {
             viewControl = React.createElement(FileView, Object.assign({}, controlProps));
             break;
         case 'non-download-file':
-            viewControl = React.createElement(FileView, Object.assign({}, controlProps));
+            viewControl = React.createElement(FileView, Object.assign({}, controlProps, { downloadable: false }));
             break;
         case 'chemstruc':
             viewControl = React.createElement(ChemStruc, Object.assign({}, controlProps));

package/lib/controls/view-control.js.map

@@ -1 +1 @@
-{"version":3,"file":"view-control.js","sourceRoot":"","sources":["../../../../src/aldehyde/controls/view-control.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"view-control.js","sourceRoot":"","sources":["../../../../src/aldehyde/controls/view-control.tsx"],"names":[],"mappings":"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"}

package/lib/login/login.js

@@ -36,7 +36,13 @@ class Loginit extends React.Component {
         this.getKaptchaToken = () => __awaiter(this, void 0, void 0, function* () {
             let res = yield HCserviceV3.getKaptchaToken();
             if (res) {
-                let kaptchaImg = `data:image/png;base64,${res.img}`;
+                let kaptchaImg;
+                if (res.img && res.img.indexOf("data:") == 0) {
+                    kaptchaImg = res.img;
+                }
+                else {
+                    kaptchaImg = `data:image/png;base64,${res.img}`;
+                }
                 this.setState({
                     kaptchaImg,
                     kaptchaToken: res.kaptchaToken,

package/lib/login/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.js"],"names":[],"mappings":"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"}

package/lib/tmpl/hcservice-v3.d.ts

@@ -33,7 +33,7 @@ export default class HcserviceV3 {
         code: any;
         status: any;
     }>;
-    static postFileAction(file: any): string;
+    static postFileAction(file: any): any;
     static postFile(formData: any, message: any): Promise<any>;
     static requestL2LtmplQueryKey(sourceId: any, condition: any): Promise<any>;
     static requestLtmplCount(sourceId: any): Promise<any>;

package/lib/tmpl/hcservice-v3.js

@@ -29,7 +29,7 @@ export default class HcserviceV3 {
         return __awaiter(this, void 0, void 0, function* () {
             if (mstrucIds.length > 0) {
                 let res = yield Super.super({
-                    url: `/v3${path}`,
+                    url: Units.joinPath("/v3", path),
                     query: {
                         mstrucIds
                     },
@@ -291,7 +291,7 @@ export default class HcserviceV3 {
         });
     }
     static postFileAction(file) {
-        return Units.api() + `/v3/upload`;
+        return Units.joinPath(Units.api(), '/v3/upload');
     }
     static postFile(formData, message) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -427,7 +427,7 @@ export default class HcserviceV3 {
     static requestFile(path) {
         return __awaiter(this, void 0, void 0, function* () {
             let res = yield Super.super({
-                url: "/v3/files/" + path,
+                url: Units.joinPath("/v3/files/", path),
                 method: "GET"
             });
             return res;
@@ -481,7 +481,7 @@ export default class HcserviceV3 {
     }
     static downloadDetailExcel(sourceId, entityCode) {
         const hydrocarbonToken = Units.hydrocarbonToken();
-        let url = Units.api() + `/v3/dtmpl/excel?sourceId=${sourceId}&code=${entityCode}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+        let url = Units.joinPath(Units.api(), `/v3/dtmpl/excel`) + `?sourceId=${sourceId}&code=${entityCode}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         Units.downloadFile(url, "详情");
     }
     static download(path) {
@@ -496,18 +496,18 @@ export default class HcserviceV3 {
     }
     static getFileUrl(path) {
         const hydrocarbonToken = Units.hydrocarbonToken();
-        let url = Units.api() + Units.joinPath("/v3/files", path) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+        let url = Units.joinPath(Units.api(), Units.joinPath("/v3/files", path)) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
     static getFileTxtUrl(path) {
         const hydrocarbonToken = Units.hydrocarbonToken();
-        let url = Units.api() + "/v3/files/text" + path + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+        let url = Units.joinPath(Units.api(), Units.joinPath("/v3/files/text", path)) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
     static loadFileTxt(path) {
         return __awaiter(this, void 0, void 0, function* () {
             let res = yield Super.super({
-                url: "/v3/files/text" + path,
+                url: Units.joinPath("/v3/files/text", path),
                 method: "GET",
             });
             return res.text;

package/lib/tmpl/hcservice-v3.js.map

@@ -1 +1 @@
-{"version":3,"file":"hcservice-v3.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"hcservice-v3.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,UAAU,CAAA;AAC5B,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAC5B,OAAO,YAAY,MAAM,uBAAuB,CAAA;AAChD,OAAO,MAAM,MAAM,OAAO,CAAC;AAE3B,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AAEvC,MAAM,CAAC,OAAO,OAAO,WAAW;IAE5B,MAAM,CAAO,WAAW,CAAC,SAAS,EAAE,IAAa;;YAC7C,IAAI,CAAC,IAAI,EAAE;gBACP,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;aAC7D;iBAAM;gBACH,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aAC1D;QACL,CAAC;KAAA;IAED,MAAM,CAAO,mBAAmB,CAAC,SAAS,EAAE,IAAI;;YAC5C,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;oBACxB,GAAG,EAAC,KAAK,CAAC,QAAQ,CAAE,KAAK,EAAC,IAAI,CAAC;oBAC/B,KAAK,EAAE;wBACH,SAAS;qBACZ;iBACJ,CAAC,CAAC;gBACH,OAAO,GAAG,CAAC,OAAO,CAAC;aACtB;iBAAM;gBACH,OAAO,EAAE,CAAC;aACb;QACL,CAAC;KAAA;IAED,MAAM,CAAO,cAAc,CAAC,QAAQ;;YAChC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;KAAA;IAED,MAAM,CAAO,kBAAkB,CAAC,QAAgB;;YAE5C,IAAI,GAAG,GAAG,kBAAkB,CAAA;YAC5B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG;gBACH,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,EAAC,QAAQ,EAAC;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,WAAW,CAAC;QAC3B,CAAC;KAAA;IAED,MAAM,CAAO,sBAAsB,CAAC,QAAgB;;YAEhD,IAAI,GAAG,GAAG,uBAAuB,CAAA;YACjC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG;gBACH,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,EAAC,QAAQ,EAAC;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,WAAW,CAAC;QAC3B,CAAC;KAAA;IAED,MAAM,CAAO,qBAAqB,CAAC,QAAgB;;YAE/C,IAAI,GAAG,GAAG,sBAAsB,CAAA;YAChC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG;gBACH,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,EAAC,QAAQ,EAAC;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,WAAW,CAAC;QAC3B,CAAC;KAAA;IACD,MAAM,CAAO,mBAAmB,CAAC,QAAQ;;YACrC,IAAI,GAAG,GAAG,mBAAmB,CAAA;YAC7B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG;gBACH,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,EAAC,QAAQ,EAAC;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,YAAY,CAAC;QAC5B,CAAC;KAAA;IAED,MAAM,CAAO,kBAAkB,CAAC,QAAQ;;YACpC,IAAI,GAAG,GAAG,kBAAkB,CAAA;YAC5B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG;gBACH,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,EAAC,QAAQ,EAAC;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,oBAAoB,CAAC,QAAQ;;YACtC,IAAI,GAAG,GAAG,qBAAqB,CAAA;YAC/B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG;gBACH,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,EAAC,QAAQ,EAAC;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,oBAAoB,CAAC,QAAQ,EAAE,SAAU;;YAClD,sCAAsC;YACtC,IAAI,GAAG,GAAG,qBAAqB,CAAA;YAC/B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,KAAK,kCAAM,SAAS,KAAE,QAAQ,GAAC;aAClC,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,oBAAoB,CAAC,QAAQ,EAAE,SAAS;;YACjD,uCAAuC;YACvC,IAAI,GAAG,GAAG,oBAAoB,CAAA;YAC9B,OAAO,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAC3E,CAAC;KAAA;IAED,MAAM,CAAO,0BAA0B,CAAC,QAAQ,EAAE,SAAS;;YACvD,sCAAsC;YACtC,IAAI,GAAG,GAAG,2BAA2B,CAAA;YACrC,OAAO,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAC3E,CAAC;KAAA;IAED,MAAM,CAAO,SAAS,CAAC,QAAQ;;YAC3B,IAAI,IAAI,GAAE,MAAM,WAAW,CAAC,0BAA0B,CAAC,QAAQ,EAAC,EAAC,GAAG,EAAC,CAAC,EAAC,CAAC,CAAC;YACzE,IAAI,WAAW,GAAC,IAAI,CAAC;YACrB,IAAG,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAC;gBACzC,WAAW,GAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;aACpC;YACD,OAAO,WAAW,CAAC;QACvB,CAAC;KAAA;IAED,MAAM,CAAO,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG;;YAE5D,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,KAAK,kCAAM,SAAS,KAAE,QAAQ,GAAC;aAClC,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,mBAAmB,CAAC,QAAQ,EAAE,KAAK;;YAC5C,IAAI,CAAC,KAAK,EAAE;gBACR,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBACzB,OAAO,IAAI,CAAC;aACf;YACD,IAAI,GAAG,GAAG,+BAA+B,CAAA;YAEzC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAC;gBACxB,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC1B,OAAO,GAAG,CAAC,QAAQ,CAAC;aACvB;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;gBACxB,OAAO,IAAI,CAAC;aACf;QACL,CAAC;KAAA;IAED,MAAM,CAAO,kBAAkB,CAAC,QAAQ,EAAE,IAAI;;YAC1C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,yBAAyB;gBAC9B,KAAK,EAAE;oBACH,MAAM,EAAE,CAAC;oBACT,QAAQ;oBACR,IAAI;iBACP;gBACD,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,QAAQ,CAAC;QACxB,CAAC;KAAA;IAGD,MAAM,CAAO,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG;;YAC9D,wBAAwB;YACxB,0CAA0C;YAC1C,IAAI;YACJ,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE;oBACH,IAAI,EAAE,SAAS,EAAE,QAAQ;iBAC5B;gBACD,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC1B,OAAO,GAAG,CAAC,MAAM,CAAC;aACrB;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;gBACvB,OAAO,IAAI,CAAC;aACf;QACL,CAAC;KAAA;IAED,MAAM,CAAO,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS;;YACnD,IAAI,GAAG,GAAG,gBAAgB,CAAC;YAC3B,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;QAC5E,CAAC;KAAA;IAED,MAAM,CAAO,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS;;YACzD,IAAI,GAAG,GAAG,uBAAuB,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;QAC5E,CAAC;KAAA;IAED,MAAM,CAAO,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS;;YACvD,IAAI,GAAG,GAAG,qBAAqB,CAAC;YAChC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;QAC5E,CAAC;KAAA;IAED,MAAM,CAAO,0BAA0B,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS;;YAC7D,IAAI,GAAG,GAAG,4BAA4B,CAAC;YACvC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;QAC5E,CAAC;KAAA;IAGD,MAAM,CAAO,mBAAmB,CAAC,QAAgB,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG;;YACxE,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,KAAK,IAAI,CAAC,IAAI,WAAW,EAAE;gBACvB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;oBAC3B,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;iBACnF;aACJ;YACD,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;YAChD,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,MAAM;aACjB,EAAE,UAAU,CAAC,CAAA;YACd,IAAI,IAAI,GAAG,IAAI,CAAC;YAChB,IAAI,GAAG,EAAE;gBACL,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;oBAC1B,IAAI,GAAG,GAAG,EAAE,CAAA;oBACZ,IAAI,GAAG,CAAC,OAAO,EAAE;wBACb,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;qBACrB;oBACD,IAAI,OAAO,EAAE;wBACT,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,EAAC,CAAC,CAAC,CAAA;qBACpC;oBACD,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;iBACrD;qBAAM;oBACH,IAAI,OAAO,EAAE;wBACT,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;qBACzB;iBACJ;aACJ;iBAAM;gBACH,IAAI,OAAO,EAAE;oBACT,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBACzB;aACJ;YACD,OAAO,EAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAC,CAAC;QACtC,CAAC;KAAA;IAED,MAAM,CAAO,aAAa,CAAC,QAAgB,EAAE,WAAW,EAAE,OAAO;;YAC7D,IAAI,GAAG,GAAG,gBAAgB,CAAC;YAC3B,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAC/E,CAAC;KAAA;IAED,MAAM,CAAO,mBAAmB,CAAC,QAAgB,EAAE,WAAW,EAAE,OAAO;;YACnE,IAAI,GAAG,GAAG,uBAAuB,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAC/E,CAAC;KAAA;IAED,MAAM,CAAC,cAAc,CAAC,IAAI;QACtB,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EAAG,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAO,QAAQ,CAAC,QAAQ,EAAE,OAAO;;YACnC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,YAAY;gBACjB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,MAAM;aACjB,EAAE,UAAU,CAAC,CAAA;YACd,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,IAAI,GAAG,EAAE;gBACL,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;oBAC1B,IAAI,OAAO,EAAE;wBACT,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;qBAC5B;oBACD,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;iBACzB;aACJ;iBAAM;gBACH,IAAI,OAAO,EAAE;oBACT,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBAC1B;aACJ;YACD,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAGD,MAAM,CAAO,sBAAsB,CAAC,QAAQ,EAAE,SAAS;;YACnD,IAAI,GAAG,GAAG,uBAAuB,CAAA;YACjC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,KAAK,kCAAM,SAAS,KAAE,QAAQ,GAAC;aAClC,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAGD,MAAM,CAAO,iBAAiB,CAAC,QAAQ;;YACnC,IAAI,GAAG,GAAG,sBAAsB,CAAC;YACjC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,EAAC,QAAQ,EAAC;gBACjB,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,KAAK,CAAC;QACrB,CAAC;KAAA;IAGD,0DAA0D;IAC1D,oCAAoC;IACpC,4CAA4C;IAC5C,mCAAmC;IACnC,mDAAmD;IACnD,gBAAgB;IAChB,YAAY;IACZ,UAAU;IACV,wBAAwB;IACxB,IAAI;IACJ,EAAE;IACF,4DAA4D;IAC5D,oCAAoC;IACpC,kDAAkD;IAClD,yCAAyC;IACzC,4CAA4C;IAC5C,gBAAgB;IAChB,YAAY;IACZ,UAAU;IACV,wBAAwB;IACxB,IAAI;IAGJ,MAAM,CAAO,gBAAgB,CAAC,QAAgB,EAAE,QAAkB;;YAC9D,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,sBAAsB;gBAC3B,MAAM,EAAE,KAAK;gBACb,KAAK,kBACA,QAAQ,IAAK,QAAQ,CAAC;aAC9B,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAC,sBAAsB,CAAC,YAA2B;QACrD,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1C,OAAO;SACV;QAED,KAAK,IAAI,IAAI,IAAI,YAAY,EAAE;YAC3B,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACzB;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;aACnC;SACJ;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACnC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAGD,MAAM,CAAO,UAAU,CAAC,QAAQ,EAAE,YAA2B;;YACzD,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;YACxD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC;KAAA;IAED,MAAM,CAAO,YAAY,CAAC,QAAQ,EAAE,KAAe;;YAC/C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,gBAAgB;gBACrB,IAAI,EAAE;oBACF,KAAK,EAAE,QAAQ;iBAClB;gBACD,MAAM,EAAE,QAAQ;aACnB,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,IAAI,SAAS,EAAE;gBACzB,OAAO,CAAC,OAAO,CAAC,MAAM,EAAC,CAAC,CAAC,CAAC;gBAC1B,OAAO,IAAI,CAAC;aACf;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACtB,oCAAoC;gBACpC,OAAO,KAAK,CAAC;aAChB;QACL,CAAC;KAAA;IAED,MAAM,CAAO,iBAAiB,CAAC,QAAQ;;YACnC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,uBAAuB;gBAC5B,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,EAAC,QAAQ,EAAC;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,KAAK,CAAC;QACrB,CAAC;KAAA;IAGD,MAAM,CAAO,WAAW,CAAC,IAAI;;YACzB,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAG,KAAK,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC;gBACxC,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,WAAW,CAAC,QAAQ,EAAE,YAA2B,EAAE,aAAsB;;YAClF,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;YACxD,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,KAAK,IAAI,CAAC,IAAI,aAAa,EAAE;gBACzB,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aAChE;YACD,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;YAChD,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,YAAY;gBACjB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,MAAM;aACjB,EAAE,UAAU,CAAC,CAAC;YACf,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,SAAS,CAAC,MAAM,EAAE,IAAY;;YACvC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE;oBACH,IAAI;oBACJ,QAAQ,EAAE,MAAM;iBACnB;gBACD,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,EAAE;;YACxC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,oBAAoB;gBACzB,MAAM,EAAE,MAAM;gBACd,IAAI,kCAAM,MAAM,KAAE,QAAQ,GAAC;aAC9B,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC1B,OAAO,CAAC,OAAO,CAAC,MAAM,EAAC,CAAC,CAAC,CAAA;aAC5B;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;aACxB;YACD,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,UAAU;QAC3C,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAClD,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,GAAC,aAAa,QAAQ,SAAS,UAAU,WAAW,gBAAgB,kBAAkB,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QACpK,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAI;QAChB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACpC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,yBAAyB,EAAE,QAAQ,CAAC,CAAA;IACnF,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO;QACzB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACpC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAI;QAClB,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAClD,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,GAAG,WAAW,gBAAgB,kBAAkB,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QAC/I,OAAO,GAAG,CAAC;IACf,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAI;QACrB,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAClD,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EAAG,KAAK,CAAC,QAAQ,CAAE,gBAAgB,EAAG,IAAI,CAAC,CAAC,GAAG,WAAW,gBAAgB,kBAAkB,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QACtJ,OAAO,GAAG,CAAC;IACf,CAAC;IAED,MAAM,CAAO,WAAW,CAAC,IAAI;;YACzB,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAG,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC;gBAC5C,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,IAAI,CAAC;QACpB,CAAC;KAAA;IAED,MAAM,CAAO,qBAAqB;;YAC9B,IAAI,GAAG,GAAG,oBAAoB,CAAA;YAC9B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,OAAO,CAAC;QACvB,CAAC;KAAA;IAED,MAAM,CAAO,8BAA8B;;YACvC,IAAI,GAAG,GAAG,8BAA8B,CAAA;YACxC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,OAAO,CAAC;QACvB,CAAC;KAAA;IAED,MAAM,CAAO,aAAa,CAAC,QAAgB,EAAE,OAAe;;YACxD,IAAI,GAAG,GAAG,iBAAiB,CAAA;YAC3B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE;oBACH,QAAQ,EAAE,OAAO;iBACpB;aACJ,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,MAAM;;YACf,KAAK,CAAC,KAAK,CAAC;gBACR,GAAG,EAAE,gBAAgB;gBACrB,MAAM,EAAE,QAAQ;aACnB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gBACZ,KAAK,CAAC,OAAO,EAAE,CAAC;YACpB,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAGD,MAAM,CAAO,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM;;YACnD,IAAI,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC7D,IAAI,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC7D,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,mBAAmB;gBACxB,KAAK,EAAE;oBACH,WAAW,EAAE,WAAW;iBAC3B;gBACD,MAAM,EAAE,MAAM;aACjB,CAAC,CAAA;YAEF,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,sBAAsB;;YAC/B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,2BAA2B;gBAChC,MAAM,EAAE,KAAK;aAChB,CAAC,CAAA;YACF,IAAI,GAAG,EAAE;gBACL,OAAO,GAAG,CAAC,MAAM,CAAC;aACrB;iBAAM;gBACH,OAAO,IAAI,CAAA;aACd;QAEL,CAAC;KAAA;IAED,MAAM,CAAO,qBAAqB;;YAC9B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,+BAA+B;gBACpC,MAAM,EAAE,KAAK;aAChB,CAAC,CAAA;YACF,OAAO,GAAG,CAAC,KAAK,CAAC;QACrB,CAAC;KAAA;IAED,MAAM,CAAO,KAAK,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM;;YAEtD,IAAI,QAAQ,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAA;YAC/D,IAAI,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;YAE5B,IAAI,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;YAErE,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,kBAAkB;gBACvB,KAAK,EAAE;oBACH,QAAQ,EAAE,YAAY,EAAE,WAAW;iBACtC;gBACD,MAAM,EAAE,KAAK;aAChB,CAAC,CAAA;YACF,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC1B,YAAY,CAAC,KAAK,EAAE,CAAC;gBACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,kBAAkB,CAAC;gBAC1C,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACxC;YACD,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,UAAU,CAAC,IAAI;;YACxB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,kBAAkB;gBACvB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,MAAM;aACjB,EAAE,UAAU,CAAC,CAAA;YAEd,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC1B,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;aACnC;YACD,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,eAAe;;YACxB,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,kBAAkB;gBACvB,MAAM,EAAE,MAAM;aACjB,CAAC,CAAA;YACF,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC1B,OAAO,GAAG,CAAA;aACb;iBAAM;gBACH,OAAO,IAAI,CAAC;aACf;QACL,CAAC;KAAA;IAED,MAAM,CAAO,YAAY;;YACrB,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,qBAAqB;gBAC1B,MAAM,EAAE,KAAK;aAChB,CAAC,CAAA;YACF,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC1B,OAAO,GAAG,CAAC,SAAS,CAAC;aACxB;iBAAM;gBACH,OAAO,IAAI,CAAC;aACf;QACL,CAAC;KAAA;IAED,MAAM,CAAO,OAAO;;YAChB,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,kBAAkB;aAC1B,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,IAAI,CAAC;QACpB,CAAC;KAAA;IAED,MAAM,CAAO,iBAAiB;;YAC1B,IAAI,GAAG,GAAG,qBAAqB,CAAA;YAC/B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;aAChB,CAAC,CAAA;YACF,OAAO,GAAG,CAAC,OAAO,CAAC;QACvB,CAAC;KAAA;IAED,MAAM,CAAO,mBAAmB;;YAC5B,IAAI,GAAG,GAAG,wBAAwB,CAAA;YAClC,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;aAChB,CAAC,CAAA;YACF,OAAO,GAAG,CAAC,OAAO,CAAC;QACvB,CAAC;KAAA;IAED,MAAM,CAAO,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,QAAQ,GAAG,EAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAC;;YACrF,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;YAC7C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,KAAK,gCACD,KAAK,IACF,MAAM,KACT,MAAM,EAAE,QAAQ,CAAC,MAAM,EACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAC9B;aACJ,CAAC,CAAC;YACH,+BAA+B;YAC/B,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO,EAAE;gBACvB,OAAO,IAAI,CAAC;aACf;iBAAM;gBACH,OAAO,GAAG,CAAC,MAAM,CAAC;aACrB;QAEL,CAAC;KAAA;IAED,MAAM,CAAO,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ;;YACxD,IAAI,GAAG,GAAG,mBAAmB,CAAA;YAC7B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE;oBACH,MAAM;oBACN,QAAQ,EAAE,QAAQ;iBACrB;aACJ,CAAC,CAAC;YACH,2CAA2C;YAC3C,OAAO,GAAG,CAAC,MAAM,CAAC;QACtB,CAAC;KAAA;IAED,MAAM,CAAO,eAAe,CAAC,IAAY,EAAE,KAAK,GAAG,CAAC;;YAChD,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;YAC/C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,KAAK;gBACL,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,iCAAiC;YACjC,OAAO,GAAG,CAAC,MAAM,CAAC;QACtB,CAAC;KAAA;IAED,MAAM,CAAO,MAAM;;YACf,IAAI,GAAG,GAAG,iBAAiB,CAAA;YAC3B,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,MAAM,CAAC,QAAe,EAAC,IAAW,EAAC,YAAY,EAAC,WAAW;;YACpE,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,sBAAsB;gBAC3B,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE;oBACH,QAAQ;oBACR,IAAI,EAAC,YAAY,EAAC,WAAW;iBAChC;aACJ,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YACb,IAAG,GAAG,CAAC,MAAM,IAAI,SAAS,EAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,EAAC,CAAC,CAAC,CAAA;aACzC;YACD,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAED,MAAM,CAAO,iBAAiB,CAAC,iBAAiB;;YAC5C,UAAU;YACV,IAAI,iBAAiB,CAAC,aAAa,CAAC,EAAE;gBAClC,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC;aAClE;YACD,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,EAAE;gBACxC,aAAa,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,CAAC;aAC9E;YAED,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAA;YAC9D,aAAa,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAA;YACtE,aAAa,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAA;YAC9E,aAAa,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAEzE,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;YAE3C,IAAG,MAAM,EAAC;gBACN,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAC,MAAM,CAAC,CAAA;gBAC5B,gBAAgB;gBAChB,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACjD,aAAa,CAAC,oBAAoB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;gBAC7D,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;gBAChD,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;gBAC5D,aAAa,CAAC,sBAAsB,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;gBAChE,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;aAC9D;QAEL,CAAC;KAAA;CAEJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.43",
+  "version": "0.2.45",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/controls/file-view/drawer-file-view.tsx

@@ -13,7 +13,7 @@ const FileViewer = loadable(() =>
     import('react-file-viewer'), {fallback: Loading});
 interface DrawerFileViewProps {
     file: FileValue,
-    downloadAble?:boolean,
+    downloadable?:boolean,
 };
 
 interface DrawerFileViewState {
@@ -22,7 +22,7 @@ interface DrawerFileViewState {
 };
 export default class DrawerFileView extends React.PureComponent<DrawerFileViewProps, DrawerFileViewState> {
     static defaultProps={
-        downloadAble:false,
+        downloadable:true,
     }
     state = {
         drawerOpen: false
@@ -37,13 +37,13 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
     }
 
     render() {
-        const {file,downloadAble} = this.props;
+        const {file,downloadable} = this.props;
         const {drawerOpen} = this.state;
         return <span className='labelcss'>
                         <Button type={'link'} onClick={() => {
                             this.setState({drawerOpen: true})
                         }} size="small">{file.base.fileName}</Button>
-            {downloadAble? <Button type={'text'} onClick={async () => {
+            {downloadable? <Button type={'text'} onClick={async () => {
                         await HCService.download(file.base.path);
                     }} size="small"><DownloadOutlined/></Button>:null}
             {drawerOpen ? <Drawer
@@ -55,7 +55,7 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
                 open={drawerOpen}
                 extra={
                 <Space>
-                    {downloadAble? <Button  onClick={async () => {
+                    {downloadable? <Button  onClick={async () => {
                         await HCService.download(file.base.path);
                     }} ><DownloadOutlined/></Button>:null}
                     <Button onClick={this.onClose}><CloseOutlined /></Button>

package/src/aldehyde/controls/file-view/index.tsx

@@ -9,7 +9,7 @@ import Player from "griffith";
 
 interface FileViewProps {
     fieldConfig: FieldConfig,
-    downloadAble?:boolean,
+    downloadable?:boolean,
     value: any,
     width?: number,
     height?:number,
@@ -22,7 +22,7 @@ interface FileViewState {
 export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {
 
     static defaultProps={
-        downloadAble:false,
+        downloadable:true,
     }
 
     state={
@@ -65,7 +65,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
 
     packFile2Show =  (file) => {
         const {urlData}=this.state;
-       const {downloadAble}=this.props;
+       const {downloadable}=this.props;
         let jsonFile=this.getJsonValue(file);
         if (jsonFile) {
                 if ("new" == jsonFile.valid) {
@@ -112,16 +112,16 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                     //         errorComponent={undefined}
                     //         onError={this.onError}/>
                     //   </span>
-                    return <DrawerFileView file={jsonFile} downloadAble={downloadAble}></DrawerFileView>
+                    return <DrawerFileView file={jsonFile} downloadable={downloadable}></DrawerFileView>
                 }
                 else if ([ 'pdf','txt'].includes(jsonFile.base.type)){
 
                     return <span className='labelcss'>
                         {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
                         <Button type={'link'} onClick={async () => {
-                            await HCService.openfile(jsonFile.base.path, downloadAble? "":'#toolbar=0');
+                            await HCService.openfile(jsonFile.base.path, downloadable? "":'#toolbar=0');
                         }} size="small">{jsonFile.base.fileName}</Button>
-                            {downloadAble? <Button type={'text'}  onClick={async () => {
+                            {downloadable? <Button type={'text'}  onClick={async () => {
                              await HCService.download(jsonFile.base.path);
                          }} size="small"><DownloadOutlined/></Button>:null}
                       </span>
@@ -129,7 +129,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                 else {
                     return <Space className='labelcss'>
                         {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
-                        {downloadAble?<><Button type={'link'} onClick={async () => {
+                        {downloadable?<><Button type={'link'} onClick={async () => {
                             await HCService.download(jsonFile.base.path);
                         }} size="small">{jsonFile.base.fileName}</Button>
                         <Button type={'text'}  onClick={async () => {

package/src/aldehyde/controls/upload/index.tsx

@@ -86,7 +86,7 @@ export default class Upload extends React.PureComponent<UploadProps, UploadState
                     uid: '-1',
                     name: value_1.base.fileName,
                     status: 'done',
-                    url: Units.api()+'/v3/files'+value_1.base.path+`?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
+                    url:  Units.joinPath(Units.joinPath(Units.api(),'/v3/files'),value_1.base.path) +`?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
                 })
             }else if(value_1.valid=='new'){
                 fileList.push({

package/src/aldehyde/controls/view-control.tsx

@@ -155,7 +155,7 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
             viewControl = <FileView {...controlProps}></FileView>
             break;
         case 'non-download-file':
-            viewControl = <FileView {...controlProps}></FileView>
+            viewControl = <FileView {...controlProps} downloadable={false}></FileView>
             break;
         case 'chemstruc':
             viewControl = <ChemStruc  {...controlProps}></ChemStruc>

package/src/aldehyde/login/login.js

@@ -31,7 +31,12 @@ class Loginit extends React.Component {
     getKaptchaToken = async () => {
         let res = await HCserviceV3.getKaptchaToken();
         if (res) {
-            let kaptchaImg = `data:image/png;base64,${res.img}`;
+            let kaptchaImg;
+            if(res.img && res.img.indexOf("data:") == 0){
+                kaptchaImg = res.img;
+            }else{
+                kaptchaImg = `data:image/png;base64,${res.img}`;
+            }
             this.setState({
                 kaptchaImg,
                 kaptchaToken: res.kaptchaToken,

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

@@ -21,7 +21,7 @@ export default class HcserviceV3 {
     static async requestEnumWithPath(mstrucIds, path) {
         if (mstrucIds.length > 0) {
             let res = await Super.super({
-                url: `/v3${path}`,
+                url:Units.joinPath( "/v3",path),
                 query: {
                     mstrucIds
                 },
@@ -262,7 +262,7 @@ export default class HcserviceV3 {
     }
 
     static postFileAction(file) {
-        return Units.api() + `/v3/upload`;
+        return Units.joinPath(Units.api() , '/v3/upload');
     }
 
     static async postFile(formData, message) {
@@ -400,7 +400,7 @@ export default class HcserviceV3 {
 
     static async requestFile(path) {
         let res = await Super.super({
-            url: "/v3/files/" + path,
+            url:  Units.joinPath("/v3/files/", path),
             method: "GET"
         });
         return res;
@@ -450,7 +450,7 @@ export default class HcserviceV3 {
 
     static downloadDetailExcel(sourceId, entityCode) {
         const hydrocarbonToken = Units.hydrocarbonToken();
-        let url = Units.api() + `/v3/dtmpl/excel?sourceId=${sourceId}&code=${entityCode}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`
+        let url = Units.joinPath(Units.api(), `/v3/dtmpl/excel`)+`?sourceId=${sourceId}&code=${entityCode}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         Units.downloadFile(url, "详情");
     }
 
@@ -468,19 +468,19 @@ export default class HcserviceV3 {
 
     static getFileUrl(path) {
         const hydrocarbonToken = Units.hydrocarbonToken();
-        let url = Units.api() + Units.joinPath("/v3/files", path) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+        let url = Units.joinPath(Units.api() , Units.joinPath("/v3/files", path)) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
 
     static getFileTxtUrl(path) {
         const hydrocarbonToken = Units.hydrocarbonToken();
-        let url = Units.api() + "/v3/files/text" + path + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
+        let url = Units.joinPath(Units.api() , Units.joinPath( "/v3/files/text" , path)) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
 
     static async loadFileTxt(path) {
         let res = await Super.super({
-            url: "/v3/files/text" + path,
+            url:  Units.joinPath("/v3/files/text", path),
             method: "GET",
         });
         return res.text;