aldehyde 0.2.234 → 0.2.236

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

@@ -0,0 +1,43 @@
+import * as React from 'react'
+import {Card, Space} from 'antd'
+import FileView, {FileViewProps} from "./index";
+
+interface MultiFileViewProps extends FileViewProps{
+
+};
+
+interface MultiFileViewState {
+
+};
+
+export default class MultiFileView extends React.PureComponent<MultiFileViewProps, MultiFileViewState> {
+    static defaultProps={
+
+    }
+
+    render() {
+        const {value} = this.props;
+        let value_1;
+        let fileList=[];
+        if (value && typeof value == "string" && value !=="") {
+            value_1 = JSON.parse(value);
+            if(value_1 instanceof Array) {
+                fileList=value_1;
+            }else{
+                fileList.push(value_1);
+            }
+        }
+        return <Space wrap={true}>
+            {
+               fileList.map(f=> {
+                   return <FileView
+                       {...this.props}
+                       value={f}
+                   />
+               })
+            }
+        </Space>
+
+    }
+
+}

package/src/aldehyde/controls/tree-select/tree-entity-select.tsx

@@ -63,7 +63,6 @@ const TreeEntitySelect=(props:TreeEntitySelectProps)=> {
     }
     let nodes= TreeUtils.getNodesOfKey({children:treeData},value);
     let values:string[]=[];
-    debugger
     if(nodes){
       nodes.forEach(n=>{
         if(valueOnly){

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

@@ -7,7 +7,9 @@ import Super from "../../tmpl/superagent";
 import { UploadFile } from "antd/es/upload/interface";
 import Units from "../../units";
 import { LocaleContext } from "../../locale/LocaleProvider";
-interface UploadProps extends EControlProps {}
+interface UploadProps extends EControlProps {
+
+}
 
 interface UploadState {}
 
@@ -26,6 +28,7 @@ export default class Upload extends React.PureComponent<
   handleChange = async (info) => {
     console.log("file change:", info);
 
+
     if (info.file.status == "done") {
       let newFile: FileValue = {
         valid: "new",
@@ -85,11 +88,13 @@ export default class Upload extends React.PureComponent<
       }
     }
 
+    let maxCount=1;
+
     return (
       <div>
         <AntdUpload
           id={id}
-          maxCount={1}
+          maxCount={maxCount}
           accept={
             itemType === "picture"
               ? ".png, .jpg, .jpeg"
@@ -107,7 +112,7 @@ export default class Upload extends React.PureComponent<
           onChange={this.handleChange}
           onRemove={this.handleRemove}
         >
-          {fileList && fileList.length >= 1 ? (
+          {fileList && fileList.length >= maxCount ? (
             ""
           ) : (
             <Button disabled={disabled}>

package/src/aldehyde/controls/upload/mult-file-upload.tsx

@@ -0,0 +1,216 @@
+import React from "react";
+import { Button, Upload as AntdUpload, message } from "antd";
+import { UploadOutlined } from "@ant-design/icons";
+import HcserviceV3 from "./../../tmpl/hcservice-v3";
+import { EControlProps, FileValue } from "../../tmpl/interface";
+import Super from "../../tmpl/superagent";
+import { UploadFile } from "antd/es/upload/interface";
+import Units from "../../units";
+import { LocaleContext } from "../../locale/LocaleProvider";
+interface UploadProps extends EControlProps {
+  maxCount:number
+}
+
+interface UploadState {
+  fileList:any[],
+}
+
+export default class MultiFileUpload extends React.PureComponent<
+  UploadProps,
+  UploadState
+> {
+  state = {fileList:null};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  handleRemove = (info) => {
+    const {fileList}=this.state;
+    const { onChange } = this.props;
+    if(fileList && fileList.length>1){
+      let tFileList=[];
+     for(let f of fileList){
+       if(f.uid != info.uid){
+         tFileList.push(f);
+       }
+     }
+      //this.setState({fileList:fileList})
+      onChange(JSON.stringify(tFileList));
+     //this.setState({fileList:tFileList});
+    }else{
+      onChange(JSON.stringify({ valid: "delete" }));
+    }
+  };
+
+  handleChange = async (info) => {
+    console.log("file change:", info);
+    let fileList:any[]=[];
+    if(info.file.status == "uploading"){
+      if(info.fileList){
+        info.fileList.forEach(a=>{
+          if(a.status  == "done"){
+            fileList.push(a);
+          }
+        })
+      }
+      // if (info.file.status == "uploading") {
+      let newFile: FileValue = {
+        valid: "new",
+        uid:info.file.uid,
+        status:info.file.status,
+        fileKey: "",
+        fileName: info.file.originFileObj.name,
+      };
+      fileList.push(newFile);
+      this.setState({fileList})
+    }else if (info.file.status == "done") {
+      let newFile: FileValue = {
+        valid: "new",
+        status:info.file.status,
+        uid:info.file.uid,
+        fileKey: info.file.response.fileKey,
+        fileName: info.file.originFileObj.name,
+      };
+      fileList.push(newFile);
+
+      if(info.fileList){
+        info.fileList.forEach(a=>{
+          if(!a.originFileObj){
+           fileList.push(a);
+          }
+        })
+      }
+      const { onChange } = this.props;
+      //this.setState({fileList:fileList})
+      onChange(JSON.stringify(fileList));
+    }
+  };
+
+  beforeUpload = (file) => {
+    const { translate } = this.context;
+
+    const isLt5M = file.size / 1024 / 1024 < 40;
+    if (!isLt5M) {
+      message.error(translate("${超过40M限制 不允许上传~}"),5);
+      return false;
+    } else {
+      return true;
+    }
+  };
+  componentDidMount() {
+    const {value}=this.props;
+      let fileList=this.transvalue(value);
+      this.setState({fileList})
+    }
+
+  componentDidUpdate(prevProps: Readonly<UploadProps>, prevState: Readonly<UploadState>, snapshot?: any) {
+    const {value:preValue}=prevProps;
+    const {value}=this.props;
+    if(value && value!=preValue){
+      let fileList=this.transvalue(value);
+      this.setState({fileList})
+    }
+  }
+
+  transvalue=(value)=>{
+    let value_1 = value;
+    let fileList = [];
+    if (typeof value_1 == "string") {
+      value_1 = JSON.parse(value);
+      if(value_1 instanceof Array){
+        value_1.forEach(a=>{
+          if (a.valid == "new") {
+            fileList.push({
+              valid:"new",
+              url:a.url,
+              fileKey:a.fileKey,
+              status:"done",
+              uid: a.uid,
+              name: a.fileName?a.fileName:a.name,
+            })
+          } else if(a.uid){
+            fileList.push({
+              atRatCode:a.atRatCode,
+              valid:a.valid,
+              uid: a.uid,
+              name: a.name,
+              fileKey:a.base?a.base.bytesInfoVO.code:a.fileKey,
+              status: "done",
+              url:a.url,
+            });
+          }else {
+            fileList.push({
+              atRatCode:a.atRatCode,
+              valid:a.valid,
+              uid: a.base?a.base.bytesInfoVO.code:a.fileKey,
+              name: a.base.fileName,
+              fileKey:a.base?a.base.bytesInfoVO.code:a.fileKey,
+              status: "done",
+              url: encodeURI(Units.joinPath(
+                      Units.joinPath(Units.api(), "/v3/files"),
+                      a.base.path
+                  )) +
+                  `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
+            });
+          }
+
+        })
+      }else if (value_1.valid === true) {
+        fileList.push({
+          atRatCode:value_1.atRatCode,
+          uid: value_1.base.bytesInfoVO.code,
+          name: value_1.base.fileName,
+          fileKey:value_1.base.bytesInfoVO.code,
+          status: "done",
+          url:
+              encodeURI(Units.joinPath(
+                  Units.joinPath(Units.api(), "/v3/files"),
+                  value_1.base.path
+              )) +
+              `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
+        });
+      }
+    }
+    return fileList;
+  }
+
+  render() {
+    const { id, itemType, disabled, value, serverKey } = this.props;
+    const { translate } = this.context;
+    const {fileList}=this.state;
+    let maxCount=this.props.maxCount?this.props.maxCount:1;
+
+    return (
+      <div>
+        <AntdUpload
+          id={id}
+          maxCount={maxCount}
+          accept={
+            itemType === "picture"
+              ? ".png, .jpg, .jpeg"
+              : itemType === "video"
+              ? ".mp4"
+              : undefined
+          }
+          listType={itemType == "picture" ? "picture" : "text"}
+          fileList={!fileList ? undefined : fileList}
+          disabled={disabled}
+          name={"file"}
+          headers={Super.getHeaderObj()}
+          action={(file) => HcserviceV3.postFileAction(serverKey, file)}
+          beforeUpload={this.beforeUpload}
+          onChange={this.handleChange}
+          onRemove={this.handleRemove}
+        >
+          {fileList && fileList.length >= maxCount ? (
+            ""
+          ) : (
+            <Button disabled={disabled}>
+              <UploadOutlined />{" "}
+              {disabled ? translate("${无需上传}") : translate("${点击上传}")}
+            </Button>
+          )}
+        </AntdUpload>
+      </div>
+    );
+  }
+}

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

@@ -14,22 +14,9 @@ import Progress from "./progress";
 import EllipsisText from "./text/ellipsis-text";
 import { ProgramConfig, useLocale } from "../index";
 import FieldHistory from "./field-history";
+import MultiFileView from "./file-view/multi-file-view";
 
-// const Loading = (() => {
-//   const { translate } = useLocale();
 
-//   return (
-//     <Spin tip="Loading...">
-//       <Alert
-//         message={translate("${正在加载数据}...")}
-//         description={translate(
-//           "${初次访问加载数据较多, 可能需要几秒或几分钟, 请耐心等待!!}"
-//         )}
-//         type="info"
-//       />
-//     </Spin>
-//   );
-// })();
 // 暂时先这样, 异步组件国际化有问题
 const Loading = <>loading</>;
 
@@ -226,6 +213,10 @@ function renderControl(
       case "video":
         viewControl = <FileView {...controlProps}></FileView>;
         break;
+      case "relfile":
+        //只是配置了，内部未做开发
+        viewControl = <MultiFileView {...controlProps}></MultiFileView>;
+        break;
       case "non-download-file":
         viewControl = (
           <FileView {...controlProps} downloadable={false}></FileView>

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -275,8 +275,6 @@ class ActDtmplView extends React.PureComponent<
                 >
                     <AntdForm.Item hidden={true} name={"actionId"}></AntdForm.Item>
                     <AntdForm.Item hidden={true} name={"mainCode"}></AntdForm.Item>
-                    {/*{this.addHiddenItem(dtmplConfig.hiddenFields)}*/}
-                    {/*{this.fieldGroupList(appDtmplConfig, currentDtmplData)}*/}
                 </AntdForm>
             </div>
         );

package/src/aldehyde/detail/view/dtmpl-view.tsx

@@ -217,9 +217,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
           if (dtmplData) {
             data = dtmplData.arrayMap[item.id];
           }
-          // console.log("dtmplData", dtmplData );
-          // console.log("dtmplData data", data );
-          // console.log("initCollapsed", dtmplData && (!data || data.length<=0));
+
           return (
             <RelationTable
               serverKey={serverKey}
@@ -234,7 +232,6 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
           );
         }
       } else {
-
         //字段组
         return (
           <CollapseCard

package/src/aldehyde/detail/view/tab-act-dtmpl-view.tsx

@@ -0,0 +1,307 @@
+import React from "react";
+import {Button, Card, Form as AntdForm, FormInstance, message, Tabs, Tooltip} from "antd";
+import {DtmplBaseProps, DtmplConfig, DtmplData} from "../../tmpl/interface";
+import {
+    ReloadOutlined,
+    ScheduleOutlined,
+    EditOutlined, BankOutlined,
+} from "@ant-design/icons";
+import HCDataSource from "../../tmpl/hc-data-source";
+import "../dtmpl.css";
+import SnapshotTimeline from "./snapshot-timeline";
+import DtmplView from "./dtmpl-view";
+import Units from "../../units";
+import ToolTipBar from "../tooltipbar";
+import {LocaleContext} from "../../locale/LocaleProvider";
+import Action from "../../controls/action";
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import LtmplTable from "../../module/ltmpl-table";
+import ActionUtils from "../../controls/action/utils";
+
+export interface ActDtmplViewProps extends DtmplBaseProps {
+    versionId?: number;
+    goBackToLtmpl?: () => void,
+    title?: any;
+    showHeader?: boolean;
+}
+
+export interface ActDtmplViewStat {
+    loading?: boolean;
+    dtmplConfig?: DtmplConfig;
+    premisesTitle?: string;
+    snapshotOpen?: boolean;
+    layout?: object;
+    refreshCode?: string;
+    actionDtmplData?:DtmplData;
+}
+
+class TabActDtmplView extends React.PureComponent<
+    ActDtmplViewProps,
+    ActDtmplViewStat
+> {
+    static defaultProps = {
+        showRightNav: true,
+        rightBarPositionRight: 15,
+        showHeader: true,
+    };
+    formRef = React.createRef<FormInstance>();
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
+
+    state = {
+        loading: true,
+        dtmplConfig: undefined,
+        snapshotOpen: false,
+        premisesTitle: "默认字段",
+        layout: {
+            labelCol: {span: 8},
+            wrapperCol: {span: 16},
+        },
+        refreshCode: undefined,
+        actionDtmplData:undefined,
+    };
+
+    async componentDidMount() {
+        const {sourceId,code, serverKey} = this.props;
+        let dtmplConfig = await HCDataSource.requestViewDtmplConfig(
+            serverKey,
+            sourceId
+        );
+
+        await this.loadActionDtmplData(dtmplConfig);
+
+        this.setState({
+            dtmplConfig,
+        });
+    }
+
+    loadActionDtmplData = async (dtmplConfig:DtmplConfig) => {
+        let actionDtmplData=undefined;
+        const {sourceId,code, serverKey} = this.props;
+        if(dtmplConfig.viewActions && dtmplConfig?.viewActions.length>0){
+            actionDtmplData = await HcserviceV3.requestViewDtmplData(
+                serverKey,
+                sourceId,
+                code,null
+            );
+        }
+        this.setState({
+            actionDtmplData,
+        });
+    };
+
+    doRefresh = async () => {
+        const {dtmplConfig} = this.state;
+        await this.loadActionDtmplData(dtmplConfig);
+        this.setState({
+            refreshCode: Units.getRandomNum(6),
+        });
+    };
+
+    goEdit = () => {
+        const {goDtmpl, code} = this.props;
+        goDtmpl(code);
+    };
+
+    showSnapshot = () => {
+        this.setState({
+            snapshotOpen: true,
+        });
+    };
+
+    onSnapshotClose = () => {
+        this.setState({
+            snapshotOpen: false,
+        });
+    };
+
+    toSnapshot = () => {
+    };
+
+    onSubmit = async (values: any) => {
+        this.setState({
+            loading: true,
+        });
+        const { sourceId, code, serverKey } = this.props;
+        if (code) {
+            //有code是修改，没有是新增实体模板
+            values["唯一编码"] = code;
+        }
+        let res = await HcserviceV3.postDtmplData(
+            serverKey,
+            sourceId,
+            values,
+            message
+        );
+        this.setState({
+            loading: false,
+        });
+        if (res.status === "success") {
+            if(this.props.goBackToLtmpl){
+                this.props.goBackToLtmpl();
+            }else{
+                this.doRefresh();
+            }
+        }
+    };
+
+    doSubmit = (actionId?: number, codes?: string[], params?: object) => {
+        const { mainCode } = this.props;
+        //if (actionId) {
+        this.formRef.current.setFieldsValue({ actionId: actionId });
+        // }
+        if (mainCode) {
+            this.formRef.current.setFieldsValue({ mainCode: mainCode });
+        }
+        if (params) {
+            this.formRef.current.setFieldsValue(params);
+        }
+        this.formRef.current.submit();
+    };
+
+    render() {
+        const {
+            showRightNav,
+            rightBarPositionRight,
+            code,
+            sourceId,
+            goDtmpl,
+            serverKey,
+            codeSource,
+            title,
+            showHeader
+        } = this.props;
+        const {
+            dtmplConfig,
+            premisesTitle,
+            loading,
+            layout,
+            snapshotOpen,
+            refreshCode,actionDtmplData,
+        } = this.state;
+        const {translate} = this.context;
+
+        const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
+        const premises = dtmplConfig ? dtmplConfig.premises : undefined;
+        let showRightNav_ = showRightNav;
+        if (dtmplConfig && dtmplConfig.groups.length < 4) {
+            showRightNav_ = false;
+        }
+
+        let items=[];
+        items.push( {
+            label: <BankOutlined size={50}/>,
+            key: 'main',
+            children: <DtmplView
+                codeSource={codeSource}
+                serverKey={serverKey}
+                refreshCode={refreshCode}
+                showRightNav={showRightNav_}
+                rightBarPositionRight={rightBarPositionRight}
+                dtmplConfig={dtmplConfig}
+                sourceId={sourceId}
+                code={code}
+            ></DtmplView>,
+        })
+        if(code && dtmplConfig?.viewRactions){
+            dtmplConfig.viewRactions.forEach(r=>{
+                if(ActionUtils.isShow(
+                    r?.preposes,
+                    [actionDtmplData],
+                    undefined
+                )){
+                    items.push( {
+                        label: r.title,
+                        key: r.id,
+                        children: <LtmplTable readOnly={true}
+                                              serverKey={null}
+                                              sourceId={r.id}
+                                              mainCode={code}
+                        ></LtmplTable>,
+                    });
+                }
+
+            })
+        }
+        return (
+            <div
+                className={`detailPage ${
+                    showRightNav_ ? "showRightNav" : "noRightNav"
+                }`}
+            ><Tabs type="card"
+                defaultActiveKey="main"
+                // size={"small"}
+                style={{ marginBottom: 32 }}
+                   tabBarExtraContent={{left:<h3 style={{marginRight:20,marginLeft:10}}>{translate("${" + (title ? title : "详情") + "}")}
+                           {dtmplConfig ? <ToolTipBar content={dtmplConfig.tip}/> : null}</h3>,
+                right:<div className="fr">
+                    {buttons &&
+                    buttons.includes("dtmplEdit") &&
+                    goDtmpl &&
+                    !dtmplConfig.editAction ? (
+                        <Button className="hoverbig" onClick={this.goEdit}>
+                            <EditOutlined/>
+                        </Button>
+                    ) : (
+                        ""
+                    )}
+                    {dtmplConfig?.viewActions?.map((ac) => {
+                        return (<Action
+                            serverKey={serverKey}
+                            iconType={"icon-title"}
+                            hiddenType={"disabled"}
+                            data={[actionDtmplData]}
+                            key={ac.id}
+                            formRef={this.formRef}
+                            actionConfig={ac}
+                            doAction={this.doSubmit}
+                        ></Action>)
+                    })}
+
+                    {buttons && buttons.includes("history") ? (
+                        <Tooltip title={translate("${数据快照}")}>
+                            <Button className="hoverbig" onClick={this.showSnapshot}>
+                                <ScheduleOutlined/>
+                            </Button>
+                        </Tooltip>
+                    ) : (
+                        ""
+                    )}
+                    <Button
+                        className="hoverbig"
+                        title={translate("${刷新}")}
+                        onClick={this.doRefresh}
+                    >
+                        <ReloadOutlined/>
+                    </Button>
+                    <SnapshotTimeline
+                        serverKey={serverKey}
+                        dtmplConfig={dtmplConfig}
+                        code={code}
+                        onClose={this.onSnapshotClose}
+                        showSnapshot={this.toSnapshot}
+                        sourceId={sourceId}
+                        open={snapshotOpen}
+                    ></SnapshotTimeline>
+                </div>}
+                }
+                items={items}
+            />
+
+                <AntdForm
+                    scrollToFirstError={true}
+                    labelWrap={true}
+                    ref={this.formRef}
+                    name="control-hooks"
+                    //onValuesChange={this.onValuesChange}
+                    onFinish={this.onSubmit}
+                >
+                    <AntdForm.Item hidden={true} name={"actionId"}></AntdForm.Item>
+                    <AntdForm.Item hidden={true} name={"mainCode"}></AntdForm.Item>
+                </AntdForm>
+            </div>
+        );
+    }
+}
+
+export default TabActDtmplView;