aldehyde 0.2.265 → 0.2.267

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

@@ -3,6 +3,7 @@ import { Modal, ModalProps as AntdModalProps, Form, Button } from "antd";
 import ActDtmplView, { ActDtmplViewProps } from "./act-dtmpl-view";
 import Scrollbars from "react-custom-scrollbars";
 import { LocaleContext } from "../../locale/LocaleProvider";
+import DraggableModal from "../../module/draggable-modal";
 interface ModalDtmplViewProps extends ActDtmplViewProps {
   height?: any;
   onCancel: () => any;
@@ -40,13 +41,13 @@ export default class ModalDtmplView extends React.PureComponent<
     const { code, sourceId, serverKey, open, onCancel, height } = this.props;
     const { translate } = this.context;
     return (
-      <Modal
+      <DraggableModal
         open={open}
         title={translate("${查看}")}
         width={"82vw"}
         centered
         wrapClassName={"aaa"}
-        bodyStyle={{ height: height, overflow: "auto" }}
+        styles={{body:{ height: height, overflow: "auto" }}}
         onCancel={onCancel}
         footer={[
           <Button key="back" onClick={onCancel}>
@@ -66,7 +67,7 @@ export default class ModalDtmplView extends React.PureComponent<
             ""
           )}
         </Scrollbars>
-      </Modal>
+      </DraggableModal>
     );
   }
 }

package/src/aldehyde/detail/view/snapshot-timeline.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Button, Drawer, Timeline } from "antd";
+import {Button, Drawer, Skeleton, Timeline} from "antd";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import "../dtmpl.css";
 import { DtmplConfig } from "../../tmpl/interface";
@@ -22,7 +22,9 @@ export interface SnapshotTimelineProps {
 export interface SnapshotTimelineStat {
   list?: SnapshotType[];
   loading?: boolean;
+  pageNo?: number;
   currents?: SnapshotType[];
+  isEnd?: boolean;
 }
 
 class SnapshotTimeline extends React.PureComponent<
@@ -32,9 +34,11 @@ class SnapshotTimeline extends React.PureComponent<
   static defaultProps = {};
 
   state = {
-    list: undefined,
+    list:undefined,
     loading: false,
     currents: [],
+    pageNo: 1,
+    isEnd:false,
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -44,41 +48,36 @@ class SnapshotTimeline extends React.PureComponent<
   async componentDidUpdate(prevProps) {
     const { open } = this.props;
     const { list } = this.state;
-    if (open && !list) {
-      this.loadData();
+    if (open && !list ) {
+      this.loadData(1);
     }
   }
 
-  loadData = async () => {
+  loadData = async (pageNo:number) => {
     const { sourceId, code, serverKey } = this.props;
-    const { currents } = this.state;
+    const { currents,list } = this.state;
     if (code) {
       this.setState({
         loading: true,
       });
-      const list = await HcserviceV3.requestVersionList(
+      const list1 = await HcserviceV3.requestVersionList(
         serverKey,
         sourceId,
-        code
+        code,pageNo
       );
-      if(currents.length==0 && list.length > 0){
-        this.onAdd(list[0]);
+      if(currents.length==0 && list1.length > 0){
+        this.onAdd(list1[0]);
       }
 
       this.setState({
-        list,
+        list:list?[...list,...list1]:list1,
         loading: false,
+        isEnd:list1.length<100,
+        pageNo:pageNo,
       });
     }
   };
 
-  // onChange = (versionId: number) => {
-  //   const { showSnapshot } = this.props;
-  //   this.setState({
-  //     current: versionId,
-  //   });
-  //   showSnapshot(versionId);
-  // };
   onAdd = (item: SnapshotType) => {
     const { showSnapshot } = this.props;
     const { currents } = this.state;
@@ -164,7 +163,7 @@ class SnapshotTimeline extends React.PureComponent<
       code,
       serverKey,
     } = this.props;
-    const { list, currents} = this.state;
+    const { list, currents,loading,pageNo,isEnd} = this.state;
     const { translate } = this.context;
 
     let viewDatas: ViewComparData[]=[];
@@ -180,10 +179,16 @@ class SnapshotTimeline extends React.PureComponent<
           closable={true}
           onClose={onClose}
           open={open}
-          width={350}
+          width={370}
         >
-          {list && list.length > 0 ? (
+          {loading?<Skeleton />:
+          list && list.length > 0 ? (
+              <>
             <Timeline mode="alternate">{this.detailHistory()}</Timeline>
+                {isEnd?"": <Button onClick={()=>{
+                  this.loadData(this.state.pageNo+1);
+              }}>下一页</Button>}
+              </>
           ) : (
             translate("${暂无历史记录}")
           )}

package/src/aldehyde/form/criteria-form.tsx

@@ -348,7 +348,8 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   };
 
   const onValuesChange = (changedValues, allValues) => {
-   let appCtmplConfig= ProgramConfig.getAppCtmplConfig(
+   debugger
+    let appCtmplConfig= ProgramConfig.getAppCtmplConfig(
         ltmplConfig,
         data,
         props

package/src/aldehyde/form/dtmpl-form.tsx

@@ -3,7 +3,6 @@ import {
   Button,
   Card,
   Form as AntdForm,
-  FormInstance,
   message,
   Switch,
 } from "antd";

package/src/aldehyde/form/form-Item-group.tsx

@@ -147,7 +147,6 @@ export default class FormItemGroup extends React.PureComponent<
     if (fields && fields.length > 0) {
       fields.forEach((item, index) => {
         let fieldValue = valueMap ? valueMap[item.id] : undefined;
-        //const fieldKey = item.id + Math.random() * 100;
         fieldValue =
           fieldValue || fieldValue == 0
             ? fieldValue
@@ -172,8 +171,7 @@ export default class FormItemGroup extends React.PureComponent<
             </FormItem>
           );
         } else {
-         // debugger;
-          // console.log("getFieldValue ---", Form.useFormInstance());
+
           formItem = item.shouldUpdate ? (
             <FormItem noStyle shouldUpdate={item.shouldUpdate}>
               {() => this.initFormItem(item, fieldValue)}

package/src/aldehyde/login/context-setter.tsx

@@ -5,6 +5,7 @@ import EntryControl from "../controls/entry-control";
 import HCserviceV3 from "../tmpl/hcservice-v3";
 import withRouter from "../routable/withroute";
 import {LocaleContext} from "../locale/LocaleProvider";
+import DraggableModal from "../module/draggable-modal";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
@@ -77,7 +78,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
         const { translate} = this.context;
         const {config,loading,context}=this.state;
         const {serverKey}=this.props;
-        return <Modal title={translate("${全局配置}")} closable={false} open={true} footer={[]}>
+        return <DraggableModal title={translate("${全局配置}")} closable={false} open={true} footer={[]}>
             <Row  justify="center" align="middle" >
                 <Col>
                     <Form style={{width: 350}} ref={this.formRef}
@@ -119,7 +120,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
                     </Form>
                 </Col>
             </Row>
-        </Modal>
+        </DraggableModal>
 
 
     }

package/src/aldehyde/module/draggable-modal.tsx

@@ -0,0 +1,67 @@
+import React, { useRef, useState } from 'react';
+import { Modal } from 'antd';
+import type { DraggableData, DraggableEvent } from 'react-draggable';
+import Draggable from 'react-draggable';
+import { ModalProps } from 'antd/lib/modal';
+
+const DraggableModal: React.FC<ModalProps> = (props) => {
+  const [disabled, setDisabled] = useState(true);
+  const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
+  const draggleRef = useRef<HTMLDivElement>(null!);
+
+  const onStart = (_event: DraggableEvent, uiData: DraggableData) => {
+    const { clientWidth, clientHeight } = window.document.documentElement;
+    const targetRect = draggleRef.current?.getBoundingClientRect();
+    if (!targetRect) {
+      return;
+    }
+    setBounds({
+      left: -targetRect.left + uiData.x,
+      right: clientWidth - (targetRect.right - uiData.x),
+      top: -targetRect.top + uiData.y,
+      bottom: clientHeight - (targetRect.bottom - uiData.y),
+    });
+  };
+
+  const {title,children, ...otherProps} = props;
+
+  return (
+    <>
+      <Modal
+        title={
+          <div
+            style={{ width: '100%', cursor: 'move' }}
+            onMouseOver={() => {
+              if (disabled) {
+                setDisabled(false);
+              }
+            }}
+            onMouseOut={() => {
+              setDisabled(true);
+            }}
+            onFocus={() => {}}
+            onBlur={() => {}}
+            // end
+          >
+            {title}
+          </div>
+        }
+        modalRender={(modal) => (
+          <Draggable
+            disabled={disabled}
+            bounds={bounds}
+            nodeRef={draggleRef}
+            onStart={(event, uiData) => onStart(event, uiData)}
+          >
+            <div ref={draggleRef}>{modal}</div>
+          </Draggable>
+        )}
+          {...otherProps}
+      >
+        {children}
+      </Modal>
+    </>
+  );
+};
+
+export default DraggableModal;

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -21,6 +21,9 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import Action from "../controls/action";
 import Scrollbars from "react-custom-scrollbars";
 import { LocaleContext } from "../locale/LocaleProvider";
+import Draggable from 'react-draggable';
+import DraggableModal from "./draggable-modal";
+
 
 interface ModalEditorProps extends DtmplBaseProps {
   height?: any;
@@ -321,35 +324,37 @@ export default class DtmplEditPage extends React.PureComponent<
       <>
         {" "}
         {pageType == "modal" ? (
-          <Modal
+         // <Draggable  handle=".ant-modal-header">
+          <DraggableModal
             open={open}
             width={width}
             title={title1}
             closable={false}
             styles={{body:{ height: height, overflow: "auto" }}}
             destroyOnHidden={true}
-            centered
+             centered
             onCancel={onCancel}
             footer={this.getFooter()}
-          >
-            <Scrollbars autoHide autoHideTimeout={1000}>
+            children={<Scrollbars autoHide autoHideTimeout={1000}>
               <div onClick={this.onClickBody}>
                 <DtmplForm
-                  serverKey={serverKey}
-                  mainCode={mainCode}
-                  parentId={id}
-                  dtmplConfig={dtmplConfig}
-                  formRef={this.formRef}
-                  sourceId={sourceId}
-                  onFinish={this.onFinish}
-                  maxColsOnRow={maxColsOnRow}
-                  showConfirm={false}
-                  dtmplData={dtmplData}
-                  onValuesChange={this.onValuesChange}
+                    serverKey={serverKey}
+                    mainCode={mainCode}
+                    parentId={id}
+                    dtmplConfig={dtmplConfig}
+                    formRef={this.formRef}
+                    sourceId={sourceId}
+                    onFinish={this.onFinish}
+                    maxColsOnRow={maxColsOnRow}
+                    showConfirm={false}
+                    dtmplData={dtmplData}
+                    onValuesChange={this.onValuesChange}
                 />
               </div>
-            </Scrollbars>
-          </Modal>
+            </Scrollbars>}
+          >
+          </DraggableModal>
+             // </Draggable>
         ) : pageType == "drawer" ? (
           <Drawer
             onClick={this.onClickBody}

package/src/aldehyde/module/dtmpl-view-modal.tsx

@@ -3,6 +3,7 @@ import { Modal} from 'antd'
 import DtmplViewCard from "./dtmpl-view-card";
 import {DtmplBaseProps} from "../tmpl/interface";
 import Scrollbars from 'react-custom-scrollbars';
+import DraggableModal from "./draggable-modal";
 interface DtmplViewModalProps extends DtmplBaseProps{
     title?:ReactNode,
     open: boolean,
@@ -35,7 +36,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
 
     render() {
         const {title,sourceId,code,open,onClose,width,height,serverKey,codeSource}=this.props;
-        return <Modal
+        return <DraggableModal
                     open={open}
                     width={width}
                     title={title}
@@ -47,7 +48,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
             <Scrollbars  autoHide autoHideTimeout={1000}>
             <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
         </Scrollbars>
-                </Modal>
+                </DraggableModal>
     }
 }
 

package/src/aldehyde/module/ltmpl-modal.tsx

@@ -3,6 +3,7 @@ import { Modal, Button, Card } from "antd";
 import LtmplTable, { LtmplTableProps } from "./ltmpl-table";
 import Scrollbars from "react-custom-scrollbars";
 import { LocaleContext } from "../locale/LocaleProvider";
+import DraggableModal from "./draggable-modal";
 
 interface LtmplDrawPageProps extends LtmplTableProps {
   onCancel: () => void;
@@ -39,24 +40,24 @@ export default class LtmplDrawer extends React.PureComponent<
     const { title, height, width, onCancel, open, ...other } = this.props;
     const { translate } = this.context;
     return (
-      <Modal
+      <DraggableModal
         open={open}
         width={width}
         title={title}
         closable={false}
-        bodyStyle={{ height: height, overflow: "auto", padding: "6 0 6 6" }}
-        destroyOnClose={true}
+        styles={{body:{ height: height, overflow: "auto", padding: "6 0 6 6" }}}
+        destroyOnHidden={true}
         centered
         onOk={onCancel}
         onCancel={onCancel}
         footer={[<Button onClick={onCancel}>{translate("${关闭}")}</Button>]}
       >
         <Scrollbars autoHide autoHideTimeout={1000}>
-          <Card bordered={false} bodyStyle={{ padding: "4px 10px 0  0" }}>
+          <Card variant={'borderless'} styles={{body:{ padding: "4px 10px 0  0" }}}>
             <LtmplTable {...other}></LtmplTable>
           </Card>
         </Scrollbars>
-      </Modal>
+      </DraggableModal>
     );
   }
 }

package/src/aldehyde/routable/dtmpl-route.tsx

@@ -2,11 +2,9 @@ import React from "react";
 import { Empty } from "antd";
 import { CodeSource, RouterCompProps } from "../tmpl/interface";
 import DtmplEdit from "../detail/edit/dtmpl-edit";
-import ActDtmplView from "../detail/view/act-dtmpl-view";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import withRouter from "./withroute";
 import TabActDtmplView from "../detail/view/tab-act-dtmpl-view";
-import Units from "../units";
 
 export interface DtmplRouteProps extends RouterCompProps {
   layoutRootPath?: string;

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

@@ -32,16 +32,10 @@ import ModelSelectTable from "./../table/modal-select-table";
 import ColumnBuilder from "./column/column-builder";
 import ReportTable from "./report-table";
 import EntryControl from "../controls/entry-control";
-import Units from "../units";
-import NavigationTree from "../controls/tree-select/navigation-tree";
-
+import DraggableModal from "../module/draggable-modal";
 const { Content, Sider } = Layout;
 type Level = "l1" | "l2";
 
-//interface LtreeData {
-//   id: string;
-//   value:string;
-// }
 
 const defaultDisabledColIds: string[] = ["20000", "10000"];
 
@@ -359,7 +353,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       );
     } else if (customButton.windowPosition == "modal-window") {
       return (
-        <Modal
+        <DraggableModal
           open={true}
           closable={true}
           width={customButton.windowWidth}
@@ -369,7 +363,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           }}
         >
           {customElement}
-        </Modal>
+        </DraggableModal>
       );
     }
   };
@@ -591,7 +585,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       path = "/";
     }
     //是否以http开头
-    if (path.indexOf("#") == 0 || url.indexOf("/#") == 0) {
+    if (path?.indexOf("#") == 0 || url?.indexOf("/#") == 0) {
       url = "";
     } else if (
       path.indexOf("http://") == 0 ||

package/src/aldehyde/table/modal-select-table.tsx

@@ -12,6 +12,7 @@ import ViewControl from "../controls/view-control";
 import SelectedRowsCard from './selected-rows-card'
 import Scrollbars from 'react-custom-scrollbars';
 import { LocaleContext } from "../locale/LocaleProvider";
+import DraggableModal from "../module/draggable-modal";
 interface ModelSelectTableProps {
     maxSelectedRows?: number,
     open: boolean,
@@ -252,13 +253,13 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         // const selectedTag=
 
         return (
-            <Modal
+            <DraggableModal
                 open={open}
                 title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection} ></SelectedRowsCard>}
                 width={1150}
-                destroyOnClose={true}
+                destroyOnHidden={true}
                 centered
-                bodyStyle={{height: '80vh', overflow: 'auto'}}
+                styles={{body:{height: '80vh', overflow: 'auto'}}}
                 onCancel={this.handleCancel}
                 onOk={this.handleOk}
             ><Scrollbars style={{ height: '80vh' }} autoHide autoHideTimeout={1000}>
@@ -272,7 +273,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                                 queryKey={queryKey}
                                 onChangeRowSelection={this.changeRowSelection}/>
                 </div> </Scrollbars>
-            </Modal>
+            </DraggableModal>
         );
     }
 }

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

@@ -310,12 +310,12 @@ export default class HcserviceV3 {
     }
   }
 
-  static async requestVersionList(serverKey: string, sourceId: string, code) {
+  static async requestVersionList(serverKey: string, sourceId: string, code,pageNo?:number) {
     let res = await Super.super({
       url: `/v3/dtmpl/data/versions`,
       serverKey,
       query: {
-        pageNo: 1,
+        pageNo: pageNo?pageNo:1,
         sourceId,
         code,
       },

package/src/aldehyde/tmpl/interface.tsx

@@ -390,6 +390,7 @@ export interface FieldConfig extends FieldBase {
   actions?: FieldAction[];
   requiredRuleCriterias?: FieldConfig[];
   usableRuleCriterias?: FieldConfig[];
+  relValueField?:FieldConfig;
   hidden?: boolean;
   serverKey?: string;
   sourceId?: string;
@@ -399,6 +400,7 @@ export interface FieldConfig extends FieldBase {
   optionCodeColId?:string;
   sortable?:boolean;
   itemBreakLine?: boolean;
+  configChanged?:boolean;
 }
 
 export interface ActionRenderProps{
@@ -445,6 +447,7 @@ export interface SelectConfig extends TmplBase {
   leftFixedCols?: number;
   minSelectRows?: number;
   maxSelectRows?: number;
+  buildInFuncFields:FieldConfig[];
   onCriteriaValuesChange?: (
     changedValues,
     allValues: DtmplData,

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -7,10 +7,11 @@ import {
   DtmplFormProps,
   FieldConfig,
   FieldGroupConfig,
-  LtmplConfig,
+  LtmplConfig, SelectConfig,
 } from "./interface";
 import { FormInstance } from "antd";
 import ActionUtils from "../controls/action/utils";
+import {CriteriaFormProps} from "../form/criteria-form";
 
 function TmplConfigAnalysis() {}
 
@@ -342,6 +343,7 @@ TmplConfigAnalysis.buildInDtmplConfig = (
           (field.requiredRuleCriterias &&
             field.requiredRuleCriterias.length > 0) ||
           (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+            || field.relValueField
         ) {
           field.shouldUpdate = true;
           buildInFuncFields.push(field);
@@ -391,13 +393,24 @@ TmplConfigAnalysis.buildInDtmplConfig = (
             field.disabled = true;
           }
         }
+        if(field.relValueField && changedValues && changedValues.hasOwnProperty(field.relValueField.id)){
+          if(!field.baseCriteria){
+            field.baseCriteria={}
+          }
+          field.baseCriteria={...field.baseCriteria,"secondCriteria":changedValues[field.relValueField.id]};
+          field.configChanged=true;
+          if(formInstance.getFieldValue(field.id)){
+            formInstance.setFieldValue(field.id,null);
+          }
+          if(formInstance.getFieldValue("c_"+field.id)){
+            formInstance.setFieldValue("c_"+field.id,null);
+          }
+        }
       }
     }
-    //debugger
     setConfig(null, dtmplData, null);
 
     dtmplConfig.onValuesChange = (changedValues, allValues, formInstance) => {
-      //debugger
       setConfig(changedValues, allValues, formInstance);
     };
     return dtmplConfig;
@@ -406,4 +419,70 @@ TmplConfigAnalysis.buildInDtmplConfig = (
   }
 };
 
+TmplConfigAnalysis.buildInCtmplConfig = (
+    ltmplConfig:SelectConfig,
+    criteriaData,
+    props: CriteriaFormProps
+) => {
+  if (!ltmplConfig.buildInFuncFields) {
+    //先找到有业务的
+    let buildInFuncFields = [];
+    for (let field of ltmplConfig.criterias) {
+        if (
+            (field.requiredRuleCriterias &&
+                field.requiredRuleCriterias.length > 0) ||
+            (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+            || field.relValueField
+        ) {
+          field.shouldUpdate = true;
+          buildInFuncFields.push(field);
+        }
+    }
+    for (let field of ltmplConfig['drillingParams']) {
+      if (
+          (field.requiredRuleCriterias &&
+              field.requiredRuleCriterias.length > 0) ||
+          (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+          || field.relValueField
+      ) {
+        field.shouldUpdate = true;
+        buildInFuncFields.push(field);
+      }
+    }
+    ltmplConfig.buildInFuncFields = buildInFuncFields;
+  }
+  if (ltmplConfig.buildInFuncFields.length > 0) {
+    function setConfig(
+        changedValues,
+        allValues: DtmplData,
+        formInstance: FormInstance
+    ) {
+      for (let field of ltmplConfig.buildInFuncFields) {
+
+        if (field.relValueField && changedValues && changedValues.hasOwnProperty("c_"+field.relValueField.id)) {
+          if (!field.baseCriteria) {
+            field.baseCriteria = {}
+          }
+          field.baseCriteria = {...field.baseCriteria, "secondCriteria": changedValues["c_"+field.relValueField.id]};
+          field.configChanged=true;
+          if (formInstance.getFieldValue(field.id)) {
+            formInstance.setFieldValue(field.id, null);
+          }
+          if (formInstance.getFieldValue("c_" + field.id)) {
+            formInstance.setFieldValue("c_" + field.id, null);
+          }
+        }
+      }
+    }
+      //debugger
+      setConfig(null, criteriaData, null);
+      ltmplConfig.onCriteriaValuesChange = (changedValues, allValues, formInstance) => {
+        setConfig(changedValues,allValues, formInstance);
+      };
+      return ltmplConfig;
+  } else {
+    return ltmplConfig;
+  }
+};
+
 export default TmplConfigAnalysis;

package/src/aldehyde/tree/tree-utils.tsx

@@ -3,7 +3,6 @@ import {DataNode} from "antd/es/tree";
 import {HydrocarbonService} from "../index";
 import {DtmplData, LtmplConfig, LtmplConfigRes, TtmplConfig} from "../tmpl/interface";
 import HCDataSource from "../tmpl/hc-data-source";
-import {array} from "prop-types";
 
 export interface TtmplNodeConfig extends TtmplConfig{
     leafTitleId?:string,