aldehyde 0.2.269 → 0.2.271

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

@@ -287,7 +287,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       return "";
     }
 
-    let customProps = { customButton: customButton, data: customButtonData };
+    let customProps = { customButton: customButton, data: customButtonData,
+      onOk:()=>{this.actTableDoSearch(null)}
+          ,onclose: () => {
+        this.setState({ customButton: undefined });
+      }
+    };
 
    let config:CustomButtonConfig= ProgramConfig.getCustomButtonConfig(customButton.id);
    let page;

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

@@ -2,17 +2,17 @@ import React from "react";
 import {
   Button,
   Col,
-  Form,
+  Form as AntdForm,
   message,
   Popover,
   Row,
   Space,
   Tooltip,
-  Typography, Popconfirm, List, Card, Descriptions,
+  Typography, Popconfirm, FormInstance,
 } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import {
-  AlignLeftOutlined,
+  AlignLeftOutlined, CheckOutlined, CloseCircleOutlined,
   DeleteOutlined,
   EditOutlined,
   FormOutlined,
@@ -40,8 +40,10 @@ import Action from "../controls/action";
 import CountingTag from "../controls/counting-tag";
 import { LocaleContext } from "../locale/LocaleProvider";
 import VerticalList from "../list/vertical-list";
+import {EntryControl} from "../index";
 
-const FormItem = Form.Item;
+
+const FormItem = AntdForm.Item;
 const { Text } = Typography;
 
 interface RelationTableProps {
@@ -56,6 +58,7 @@ interface RelationTableProps {
   value: DtmplData[];
   onChange?: (fieldGroupConfig: FieldGroupConfig, value: DtmplData[]) => void;
   initCollapse?: boolean;
+  // rowEditForm?: FormInstance;
 }
 
 interface RelationTableStat {
@@ -69,6 +72,8 @@ interface RelationTableStat {
   filterStr?: string;
   pageSize?: number;
   addTmplId?: string;
+  editings?:string[];
+  uploadingFiles?:object[];
 }
 
 class RelationTable extends React.PureComponent<
@@ -86,14 +91,13 @@ class RelationTable extends React.PureComponent<
     filterStr: undefined,
     pageSize: 10,
     addTmplId: undefined,
-    // columns:[],
-    // dataSource:[],
-    // current:1,
-    // title:undefined,
+    editings:[],
+    uploadingFiles:[],
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
   static defaultProps = {};
+  formRef = React.createRef<FormInstance>();
 
   async componentDidMount() {
     // const {fieldGroupConfig} = this.props;
@@ -118,7 +122,6 @@ class RelationTable extends React.PureComponent<
   buildDataSource = () => {
     const { filterStr } = this.state;
     const { value } = this.props;
-
     let dataSource = undefined;
 
     /** 构建 dataSource **/
@@ -136,7 +139,7 @@ class RelationTable extends React.PureComponent<
         }
         if (flag) {
           let row = {
-            key: index,
+            key: item.code,
             relationLabel: item.relationLabel,
             code: item.code, //增加code,为了删除操作
             ...item.fieldMap,
@@ -157,9 +160,10 @@ class RelationTable extends React.PureComponent<
       showRelationName,
       relationNames,
       disabled,
-      deleteData,
+      deleteData,addOrEditType
     } = fieldGroupConfig;
     const { translate } = this.context;
+    const {editings}=this.state;
     let columns = [];
     /** 构建column **/
     let s = 0;
@@ -174,13 +178,23 @@ class RelationTable extends React.PureComponent<
         TableUnits.sort(column, itemType);
       }
       column["render"] = (text, record) => {
-        return (
-          <ViewControl
-            serverKey={serverKey}
-            holderType={"table"}
-            fieldConfig={item}
-            value={record[item.id]}
-          />
+
+        return (editings.indexOf(record.code)>=0?
+
+            <FormItem style={{margin:0}} name={record.code+"_"+item.id} key={record.code+"_"+item.id}
+            initialValue={record[item.id]} >
+                <EntryControl
+                  serverKey={serverKey}
+                  //holderType={"table"}
+                  fieldConfig={item}
+                  value={record[item.id]}
+                /></FormItem>:
+            <ViewControl
+                serverKey={serverKey}
+                holderType={"table"}
+                fieldConfig={item}
+                value={record[item.id]}
+            />
         );
       };
     });
@@ -260,8 +274,9 @@ class RelationTable extends React.PureComponent<
                 })
               : ""}
             {/*行编辑*/}
-            {rowEdit ? (
-              <RowEditor
+            {rowEdit && editings.indexOf(record.code)<0 ? (
+                addOrEditType !== "tableRow" ?
+                <RowEditor
                 serverKey={serverKey}
                 disabled={disabled}
                 buttonIcon={<EditOutlined />}
@@ -269,10 +284,17 @@ class RelationTable extends React.PureComponent<
                 fieldGroupConfig={fieldGroupConfig}
                 onOk={this.handleRowEdit}
                 tooltipTitle={translate("${编辑}${当前行}")}
-              ></RowEditor>
-            ) : (
-              ""
-            )}
+              ></RowEditor>:<Button icon={<EditOutlined />} size={'small'}
+                                    onClick={()=>this.setState({editings:[...editings,record.code]})} >
+                      </Button>
+            ) : ""
+            }
+            {editings.indexOf(record.code)>=0?
+                <><Button onClick={()=>this.saveRowData(record.code)}
+                          icon={<CheckOutlined />} size={'small'}></Button>
+                  <Button onClick={()=>this.cancelRowEdit(record.code)}
+                          icon={<CloseCircleOutlined />} size={'small'}></Button>
+                </>:""}
             {/*删除*/}
             {deletable ?
                 deleteData? <Popconfirm
@@ -397,6 +419,7 @@ class RelationTable extends React.PureComponent<
         }
       }
     }
+    debugger
     //直接删除
     if(fieldGroupConfig.deleteData){
       let result: boolean = await HcserviceV3.deleteByCode(serverKey, fieldGroupConfig.id, [record.code]);
@@ -521,19 +544,23 @@ class RelationTable extends React.PureComponent<
 
   handleRowEdit = (dtmplData: DtmplData) => {
     const { value, fieldGroupConfig, onChange } = this.props;
-    const { translate } = this.context;
     let datas: DtmplData[] = [];
     if (value) {
       datas = [...value];
     }
 
+    debugger
     let isAdd = true;
     for (let v of datas) {
       if (v.code == dtmplData.code) {
         isAdd = false;
-        v.editStatus = dtmplData.editStatus;
+        if(dtmplData.editStatus){
+          v.editStatus = dtmplData.editStatus;
+        }
         v.fieldMap = dtmplData.fieldMap;
-        v.relationLabel = dtmplData.relationLabel;
+        if(dtmplData.relationLabel){
+          v.relationLabel = dtmplData.relationLabel;
+        }
         break;
       }
     }
@@ -542,14 +569,11 @@ class RelationTable extends React.PureComponent<
     }
     onChange(fieldGroupConfig, datas);
 
-    //console.log("handleRowEdit data:",datas);
-
-    if (isAdd) {
-      message.success(translate("${已添加}"));
-    } else {
-      message.success(translate("${已修改}"));
-    }
-    //this.hiddenRowEdit();
+    // if (isAdd) {
+    //   message.success(translate("${已添加}"));
+    // } else {
+    //   message.success(translate("${已修改}"));
+    // }
   };
 
   showAddDtmplModel = (addTmplId?: string) => {
@@ -588,11 +612,94 @@ class RelationTable extends React.PureComponent<
     });
   };
 
+  addNewRow=(defaultValue)=>{
+    const { value, fieldGroupConfig, onChange } = this.props;
+    const {editings}=this.state;
+    let datas: DtmplData[] = [];
+    if (value) {
+      datas = [...value];
+    }
+    let fieldMaps=[];
+    if(!defaultValue){
+      fieldMaps=[{}]
+    }else if(Array.isArray(defaultValue)){
+      fieldMaps=defaultValue;
+    }else{
+      fieldMaps=[defaultValue]
+    }
+
+    let editingCodes=[...editings];
+    let i=0;
+    debugger
+    for(let f of fieldMaps){
+      let newData: DtmplData = {};
+      newData.code=Date.now()+""+i++;
+      newData.relationLabel=fieldGroupConfig.relationNames[0]
+      newData.fieldMap=f;
+      datas.unshift(newData);
+      editingCodes.push(newData.code);
+    }
+
+    this.setState({editings:editingCodes})
+    onChange(fieldGroupConfig, datas);
+  }
+
+  saveRowData=async (code:string)=>{
+   let currentForm= this.formRef.current;
+   let dtmplData:DtmplData = {code};
+    dtmplData.fieldMap={};
+    dtmplData.editStatus="changed";
+    await currentForm.validateFields().then(async (values) => {
+      for (let key in values) {
+        if (values.hasOwnProperty(key) && key.startsWith(code)) {
+          dtmplData.fieldMap[key.split("_")[1]]=values[key];
+        }
+      }
+    }).catch(errorInfo => {
+    })
+    this.cancelRowEdit(code);
+    this.handleRowEdit(dtmplData);
+  }
+
+  cancelRowEdit=(code:string)=>{
+    const {editings}=this.state
+   // editings..unshift(code);
+    let arr = editings.filter(item => item !== code);
+    this.setState({editings:[...arr]});
+  }
+
+  uploadFiles=(values)=> {
+
+    const {batchAddFileField} = this.props.fieldGroupConfig
+    if (values) {
+
+      let uploading = false;
+      let vals=JSON.parse(values);
+      for (let value of vals) {
+        if (!value.status ||  value.status != "done") {
+          uploading = true;
+        }
+      }
+      let datas=[];
+      if (!uploading) {
+        for (let value of vals) {
+          let data = {};
+          data[batchAddFileField.id] =JSON.stringify(value) ;
+          datas.push(data);
+        }
+        this.addNewRow(datas);
+        this.setState({uploadingFiles:[]})
+      }else{
+        this.setState({uploadingFiles:values})
+      }
+    }
+  }
+
   buildButtons = () => {
     const { fieldGroupConfig, viewOrEdit, value, serverKey } = this.props;
     const { translate } = this.context;
-    const { buttons, disabled } = fieldGroupConfig;
-    const { showRowEdit } = this.state;
+    const { buttons, disabled,addOrEditType,batchAddFileField } = fieldGroupConfig;
+    const { showRowEdit,uploadingFiles } = this.state;
 
     const buttonDisabled: boolean = disabled
       ? disabled
@@ -606,10 +713,15 @@ class RelationTable extends React.PureComponent<
           <Col span={20}>
             <Space>
               {buttons.includes("rowAdd") ? (
+                      addOrEditType=="tableRow"?
+                          <>
+                          <Button onClick={()=>this.addNewRow(undefined)}>{translate("${添加一行}")}</Button>
+                            {batchAddFileField? <EntryControl value={uploadingFiles} onChange={this.uploadFiles} fieldConfig={{controlType:"relfile"}}/> :""}
+                          </>:
                 <RowEditor
                   serverKey={serverKey}
                   disabled={buttonDisabled}
-                  buttonStyle={{ marginBottom: 10 }}
+                  buttonStyle={{marginBottom:10}}
                   buttonTitle={translate("${新建一行}")}
                   fieldGroupConfig={fieldGroupConfig}
                   onOk={this.handleRowEdit}
@@ -766,7 +878,10 @@ class RelationTable extends React.PureComponent<
                 dataSource={this.buildDataSource()}
                 columnConfigs={fieldGroupConfig?.fields}
                 serverKey={serverKey}
-                columns={this.buildColumns()}/>:<Table
+                columns={this.buildColumns()}/>:
+                <AntdForm
+                    ref={this.formRef} component={false}>
+                <Table
               size={"small"}
               locale={{
                 emptyText: (
@@ -781,7 +896,7 @@ class RelationTable extends React.PureComponent<
               columns={this.buildColumns()}
               pagination={page}
               onChange={this.tabChange}
-            /> }
+            /></AntdForm> }
           </div>
         </CollapseCard>
         {buttons.includes("detail") ? (

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -35,7 +35,7 @@ SupportInputTypes.add('progress');
 SupportInputTypes.add('password');
 SupportInputTypes.add('preselect');
 SupportInputTypes.add('select');
-SupportInputTypes.add('multiselect');
+SupportInputTypes.add('select');
 SupportInputTypes.add('checkbox');
 SupportInputTypes.add('radio');
 SupportInputTypes.add('yes-no-select');

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -428,24 +428,26 @@ HCDataSource.requestBlocks = async (l2MenuId: string, blockId: string) => {
 };
 
 HCDataSource.initfastMenu = async () => {
-  // let result:Map<string,Level2Menu[]> ;
-  if (fastMenuCache.size < 1) {
-    let re = await HcserviceV3.requestFastMenu();
-    if (re) {
-      for (let e in re) {
-        fastMenuCache.set(e, re[e]);
+   if (!fastMenuCached) {
+    if (fastMenuCache.size < 1) {
+      let re = await HcserviceV3.requestFastMenu();
+      if (re) {
+        for (let e in re) {
+          fastMenuCache.set(e, re[e]);
+        }
       }
+
     }
+     fastMenuCached = true;
   }
 };
 
 HCDataSource.fastMenu = async (key: string) => {
   // let result:Map<string,Level2Menu[]> ;
-  if (!fastMenuCached) {
-    fastMenuCached = true;
-    await HCDataSource.initfastMenu();
-  }
-
+  // if (!fastMenuCached) {
+  //   fastMenuCached = true;
+    let re = await HCDataSource.initfastMenu();
+  //}
   return fastMenuCache.get(key);
 };
 
@@ -521,6 +523,7 @@ HCDataSource.clear = async function() {
   // optionsMap.clear();
   blocksCache.splice(0, blocksCache.length);
   blocksCached = false;
+  fastMenuCached=false;
   // quickEntranceCache.splice(0, quickEntranceCache.length);
   // messageCache.splice(0, quickEntranceCache.length);
   // workbenchCache.splice(0, workbenchCache.length);

package/src/aldehyde/tmpl/interface.tsx

@@ -215,6 +215,7 @@ export interface ProgramAuth extends OrderableTmplBase {}
 export interface Level2Menu extends MenuBase {
   items: (BlockMenu | Level2Menu)[];
   customPath?: string;
+  dragDropPageId?: string;
   displayTotal?: boolean;
   count?: number;
   disabled?: boolean;
@@ -326,6 +327,8 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   defaultCriteriaValue?: object;
   deleteData?:boolean;
   viewModel?:"table"|"verticalList";
+  addOrEditType?:"singleCol"|"doubleCol"|"tableRow";
+  batchAddFileField?:FieldConfig;
 }
 
 export type SaveJumpType = "list" | "add" | "edit";
@@ -418,7 +421,7 @@ export interface ActionRenderProps{
   doRowJump?:(jump: JumpConfig, record: DtmplData)=>any,
   blockMenuTreeDrawerOpen?:(record)=>any,
   doRowAction?:(actionId: string, codes: string[], params: object) =>any,
-  doDeleteByCode?:(code: string)=>any,sortColumns:any
+  doDeleteByCode?:(code: string)=>any,sortColumns:any,
 }
 
 export interface FileRule {
@@ -557,7 +560,7 @@ export interface DtmplData {
   title?: string;
   relationLabel?: string;
   fieldMap?: object;
-  arrayMap?: object; //Map<number,DtmplData[]>
+  arrayMap?: object;
 }
 export interface GridLayout{
   rowSpan?:number,
@@ -745,6 +748,7 @@ export interface BlockType {
   disabled?: boolean; // 是否禁用
   hiddenOnDisabled?: boolean; // 是否隐藏
   customPath?: string; // 自定义页面路径
+  dragDropPageId?:string;
   pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树"|"导入"|"报表"; // 页面类型
   defaultCriteriaValue?: { [key: string]: string }; // 一些组件参数
   linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式

package/src/aldehyde/welcome/HCWelcome.js

@@ -1,14 +1,9 @@
-import React, { useEffect, useLayoutEffect } from "react";
-import { Button, Card, Col, Row } from "antd";
-import { BarChartOutlined, FilterOutlined } from "@ant-design/icons";
+import React from "react";
 import QuickEntrance from "./quick-entrance";
 import Workbench from "./workbench";
 import "./index.css";
 import Units from "../units";
 import withRouter from "../routable/withroute";
-import BlockMenuAuthTree from "../tree/block-menu-auth-tree";
-import BlockMenuAuthTreeDrawer from "../module/block-menu-tree-drawer";
-import LtmplTable from "../module/ltmpl-table";
 import WelcomeBg from "./img/welcome.png";
 import { useParams } from "react-router-dom";