aldehyde 0.2.175 → 0.2.178

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

@@ -13,6 +13,7 @@ import Progress from "./progress";
 
 import EllipsisText from "./text/ellipsis-text";
 import { ProgramConfig, useLocale } from "../index";
+import FieldHistory from "./field-history";
 
 // const Loading = (() => {
 //   const { translate } = useLocale();
@@ -51,6 +52,7 @@ interface FieldViewControlProps {
   fieldConfig: FieldConfig;
   holderType: ControlHolderType;
   style?: any;
+  dataCode?:string;
 }
 
 function renderControl(
@@ -85,6 +87,7 @@ function renderControl(
     ? fieldConfig.defaultValue
     : "";
   let viewOrEdit: ViewOrEdit = "view";
+
   let controlProps = {
     fieldConfig,
     itemType,
@@ -263,7 +266,7 @@ function renderControl(
         );
         break;
       case "field-history": //
-        viewControl = <></>;
+        viewControl = <FieldHistory {...controlProps} ></FieldHistory>;
         break;
       default:
         viewControl = unSupportControl;

package/src/aldehyde/detail/dtmpl.css

@@ -4,50 +4,54 @@
 /*    width:120px;*/
 /*}*/
 
-.downEditPic{
-    display:inline-block;
+.downEditPic {
+  display: inline-block;
 }
-.downEditPic a{
-    visibility: hidden;
-    color:#1890ff;
-    cursor: pointer;
+.downEditPic a {
+  visibility: hidden;
+  color: #1890ff;
+  cursor: pointer;
 }
-.downEditPic:hover a{
-    visibility:visible;
+.downEditPic:hover a {
+  visibility: visible;
 }
-.editPic .ant-upload-list{
-    width:150px
+.editPic .ant-upload-list {
+  width: 150px;
 }
-.buttonGroup{
-    position: fixed;
-    width:100px;
-    bottom: 30px;
-    right: 20px;
-    z-index: 99;
+.buttonGroup {
+  position: fixed;
+  width: 100px;
+  bottom: 30px;
+  right: 20px;
+  z-index: 99;
 }
 
-.buttonGroup button{
-    margin-bottom: 10px;
+.buttonGroup button {
+  margin-bottom: 10px;
 }
 
-.detailPage h3{
-    font-size: 18px;
+.detailPage h3 {
+  font-size: 18px;
 }
-.detailPage.showRightNav .ant-card{
-	min-width: 740px;
-    max-width: 1440px;
-	width:90%
+.detailPage.showRightNav .ant-card {
+  min-width: 740px;
+  max-width: 1440px;
+  width: 90%;
 }
 
-.detailPage.noRightNav .ant-card{
-    min-width: 740px;
-    width:100%
+.detailPage.noRightNav .ant-card {
+  min-width: 740px;
+  width: 100%;
 }
 
-.actionbtn button{
-    margin-right: 5px;
+.actionbtn button {
+  margin-right: 5px;
 }
 
-.detailPage .pad{
-    margin-right: 100px;
+.detailPage .pad {
+  margin-right: 100px;
+}
+
+.ant-descriptions-item-content:has(.description-content) {
+  overflow: hidden;
 }

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

@@ -113,11 +113,11 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
       parentId,
     } = this.props;
     const { dtmplData, loading, id } = this.state;
-
     let groups: FieldGroupConfig[] = [];
     if (dtmplConfig) {
       groups = dtmplConfig.groups;
     }
+
     return groups.map((item) => {
       if (item.type == "embed") {
         if (!dtmplData) {
@@ -234,6 +234,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
           );
         }
       } else {
+
         //字段组
         return (
           <CollapseCard
@@ -245,7 +246,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
             headStyle={{ background: "#f2f4f5" }}
             loading={loading}
           >
-            <FieldViewGroup
+            <FieldViewGroup dataCode={dtmplData ? dtmplData.code:null}
               serverKey={serverKey}
               fields={item.fields}
               valueMap={dtmplData ? dtmplData.fieldMap : undefined}

package/src/aldehyde/detail/view/field-view-group.tsx

@@ -9,6 +9,7 @@ interface FieldViewGroupProps {
   fields: FieldConfig[];
   valueMap?: object;
   width?: number;
+  dataCode?: string;
 }
 
 interface FieldViewGroupState {
@@ -29,7 +30,7 @@ export default class FieldViewGroup extends React.PureComponent<
   context: React.ContextType<typeof LocaleContext>;
 
   initViewList = () => {
-    const { fields, valueMap, serverKey } = this.props;
+    const { fields, valueMap, serverKey, dataCode } = this.props;
     const { translate } = this.context;
     const formItemList = [];
 
@@ -53,12 +54,20 @@ export default class FieldViewGroup extends React.PureComponent<
               key={index}
               className="labelcss"
             >
-              <ViewControl
-                serverKey={serverKey}
-                holderType={"descriptions"}
-                value={fieldValue}
-                fieldConfig={item}
-              />
+              <div
+                className="description-content"
+                style={{
+                  width: "100%",
+                }}
+              >
+                <ViewControl
+                  dataCode={dataCode}
+                  serverKey={serverKey}
+                  holderType={"descriptions"}
+                  value={fieldValue}
+                  fieldConfig={item}
+                />
+              </div>
             </Descriptions.Item>
           );
           formItemList.push(formItem);
@@ -69,6 +78,6 @@ export default class FieldViewGroup extends React.PureComponent<
   };
 
   render() {
-    return <Descriptions column={2} >{this.initViewList()}</Descriptions>;
+    return <Descriptions column={2}>{this.initViewList()}</Descriptions>;
   }
 }

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

@@ -384,6 +384,7 @@ export default class DtmplForm extends React.PureComponent<
               mainCode={mainCode}
               maxColsOnRow={maxColsOnRow}
               fields={item ? item.fields : undefined}
+              dataCode={dtmplData ? dtmplData.code : undefined}
               valueMap={dtmplData ? dtmplData.fieldMap : undefined}
             ></FormItemGroup>
           </CollapseCard>

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

@@ -84,6 +84,7 @@ export default class Form extends React.PureComponent<
         >
           {this.selectRelation()}
           <FormItemGroup
+              dataCode={dtmplData ? dtmplData.code : undefined}
             serverKey={serverKey}
             formRef={formRef}
             nameAttr={"id"}

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

@@ -18,6 +18,7 @@ export interface FieldGroupProps {
   maxColsOnRow?: number;
   mainCode?: string;
   formRef?: RefObject<FormInstance>;
+  dataCode?:string,
 }
 
 interface FieldGroupState {
@@ -76,7 +77,7 @@ export default class FormItemGroup extends React.PureComponent<
     return fieldConfig;
   };
   initFormItem = (fieldConfig: FieldConfig, fieldValue) => {
-    const { nameAttr, maxColsOnRow, mainCode, serverKey } = this.props;
+    const { nameAttr, maxColsOnRow, mainCode, serverKey,dataCode } = this.props;
     const { translate } = this.context;
     let item = this.getFieldConfig(fieldConfig);
     const title = item.title;
@@ -85,7 +86,7 @@ export default class FormItemGroup extends React.PureComponent<
       <FormItem
         label={translate("${" + item.title + "}")}
         hidden={item.hidden}
-        name={item[nameAttr]}
+        name={fieldConfig.controlType=="field-history" ?undefined:item[nameAttr]}
         key={item.id}
         labelCol={
           maxColsOnRow == 1
@@ -115,7 +116,7 @@ export default class FormItemGroup extends React.PureComponent<
             : undefined
         }
       >
-        <EntryControl
+        <EntryControl dataCode={dataCode}
           serverKey={serverKey}
           mainCode={this.getMainCode(item, mainCode)}
           value={fieldValue}

package/src/aldehyde/layout/MainPage.tsx

@@ -52,6 +52,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
 
   async componentDidMount() {
     useVarCssColor(generate("rgb(22, 119, 255)"));
+    localStorage.setItem("version", "v1");
 
     var currentURL = new URL(window.location.href);
     //console.log('main page currentURL:',currentURL);

package/src/aldehyde/layout2/page.tsx

@@ -125,6 +125,10 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
     token: { colorPrimary },
   } = useToken();
 
+  useEffect(() => {
+    localStorage.setItem("version", "v2");
+  }, []);
+
   const [systemName, setSystemName] = useState("");
 
   const [menu, SetMenu] = useState<MenuType[]>([]);

package/src/aldehyde/login/login.tsx

@@ -48,6 +48,8 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
 
   componentDidMount = async () => {
     const { programCode } = this.props;
+    localStorage.setItem("version", "v1");
+
     if (programCode) Units.setProgramCode(programCode);
     window.removeEventListener("keydown", this.handleKeyDown);
     let pubkey = await HCserviceV3.getRasPubkey(null, programCode);

package/src/aldehyde/login2/Login.tsx

@@ -21,6 +21,10 @@ const Login = (props: LoginPropType) => {
   // locale
   const { translate } = useLocale();
 
+  useEffect(() => {
+    localStorage.setItem("version", "v2");
+  }, []);
+
   const { programCode: routeProgramCode } = useParams();
   useEffect(() => {
     if (routeProgramCode === undefined) return;

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

@@ -79,6 +79,7 @@ import BlockMenuTreeDrawer from "../module/block-menu-tree-drawer";
 import EditButton from "../detail/button/edit-button";
 import ViewButton from "../detail/button/view-button";
 import ProgramConfig from "../units";
+import ModelSelectTable from "./../table/modal-select-table";
 
 const DragHandle = SortableHandle(() => (
   <MenuOutlined style={{ cursor: "grab", color: "#999" }} />
@@ -133,6 +134,7 @@ interface ActTableStat {
   showCustomCard?: boolean;
   customButton?: CustomButton;
   customButtonData?: DtmplData[];
+  showRatmplSelector?:boolean;
 }
 
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
@@ -156,6 +158,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     showCustomCard: false,
     customButtonData: undefined,
     customButton: undefined,
+    showRatmplSelector:false,
   };
 
   static contextType = LocaleContext;
@@ -889,7 +892,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   doDelete = async () => {
-    const { sourceId, serverKey } = this.props;
+    const { sourceId, serverKey,mainCode } = this.props;
     const {
       selectedRows,
       hiddenColIds,
@@ -902,7 +905,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     let result: boolean = await HcserviceV3.deleteData(
       serverKey,
       sourceId,
-      selectedRows
+      selectedRows,mainCode
     );
     if (result) {
       //重新加载数据
@@ -915,14 +918,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   doDeleteByCode = async (code: string) => {
-    const { sourceId, serverKey } = this.props;
+    const { sourceId, serverKey,mainCode } = this.props;
     const { hiddenColIds, hiddenRowCodes, sortedColConfigs } = this.state;
     this.setState({
       loading: true,
     });
-    let result: boolean = await HcserviceV3.deleteByCode(serverKey, sourceId, [
-      code,
-    ]);
+    debugger
+    let result: boolean = await HcserviceV3.deleteByCode(serverKey, sourceId, [code],mainCode);
     if (result) {
       //重新加载数据
       this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
@@ -1090,6 +1092,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
   };
 
+
+
   changeRowSelection = (
     selectedRows: SelectedRow[],
     selectedDatas: DtmplData[]
@@ -1165,6 +1169,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
               </Button>
             </Popover>
           ) : null}
+          {buttons.includes("ratmplSelect")  ? (
+              <Button onClick={() => this.setState({showRatmplSelector:true})}>{translate("${选择}")}
+              </Button>
+              ) : (
+                 ""
+              )}
           {buttons.includes("dtmplAdd") && doCreate && !readOnly ? (
             ltmplConfig.classAddConfigs &&
             ltmplConfig.classAddConfigs.length > 0 ? (
@@ -1204,7 +1214,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             <Tooltip title={translate("${导入}")}>
               {" "}
               <Button
-                href={`#/v2/${sourceId}/importer?menuId=${menuId}`}
+                href={`#${
+                  localStorage.getItem("version") === "v2" ? "/v2" : ""
+                }/${sourceId}/importer?menuId=${menuId}`}
                 target={"_blank"}
               >
                 <UploadOutlined />
@@ -1527,6 +1539,24 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     );
   };
 
+  saveRatmplSelect = async (selectedRows: SelectedRow[]) => {
+    this.setState({
+      showRatmplSelector: false,
+    });
+    const {serverKey,sourceId,mainCode,doSearch}=this.props;
+    if (!selectedRows || selectedRows.length <= 0) {
+      return;
+    }
+
+    //查询
+    const codes: string[] = [];
+    for (let row of selectedRows) {
+      codes.push(row.code);
+    }
+    await HcserviceV3.saveRatmplSelectCodes(serverKey,sourceId,mainCode,codes);
+    doSearch(null);
+  };
+
   render() {
     let {
       queryKey,
@@ -1535,7 +1565,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       recordCode,
       showCustomCard,
       customButton,
-      customButtonData,
+      customButtonData,showRatmplSelector
     } = this.state;
     let {
       sourceId,
@@ -1543,7 +1573,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       title,
       collapsible,
       initCollapse,
-      tip,
+      tip,serverKey,mainCode
     } = this.props;
     const { translate } = this.context;
 
@@ -1599,6 +1629,23 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           open={blockMenuTreeDrawerOpen}
           roleCode={recordCode}
         />
+        {showRatmplSelector ? (
+            <ModelSelectTable
+                serverKey={serverKey}
+                // defaultCriteriaValue={fieldGroupConfig.defaultCriteriaValue}
+                // maxSelectedRows={fieldGroupConfig.max}
+                open={showRatmplSelector}
+                onOK={this.saveRatmplSelect}
+                onCancel={() => {
+                  this.setState({ showRatmplSelector: false });
+                }}
+                mainCode={mainCode}
+                sourceId={sourceId}
+                existRelation={"false"}
+            ></ModelSelectTable>
+        ) : (
+            ""
+        )}
       </>
     );
   }

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

@@ -13,11 +13,12 @@ import SelectedRowsCard from './selected-rows-card'
 import Scrollbars from 'react-custom-scrollbars';
 import { LocaleContext } from "../locale/LocaleProvider";
 interface ModelSelectTableProps {
-    maxSelectedRows: number,
+    maxSelectedRows?: number,
     open: boolean,
     serverKey?:string,
     sourceId: string,
     mainCode:string,
+    existRelation?:string,
     exceptCodes?: string[],
     onCancel: () => void,
     defaultCriteriaValue?:object,
@@ -66,10 +67,10 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
             pageSize:pageSize?pageSize: defaultPageSize,
             virtualEndPageNo: undefined,
         }
-        const {sourceId, exceptCodes,serverKey,mainCode} = this.props;
+        const {sourceId, exceptCodes,serverKey,mainCode,existRelation} = this.props;
         /** 构建 dataSource **/
             //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode});
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode,existRelation});
         this.setState({
             queryKey,
             criteriaData,

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

@@ -8,7 +8,7 @@ import {
   Row,
   Space,
   Tooltip,
-  Typography,
+  Typography,Popconfirm,
 } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import {
@@ -158,6 +158,7 @@ class RelationTable extends React.PureComponent<
       relationNames,
       showRowNum,
       disabled,
+      deleteData,
     } = fieldGroupConfig;
     const { translate } = this.context;
     let columns = [];
@@ -277,18 +278,33 @@ class RelationTable extends React.PureComponent<
               ""
             )}
             {/*删除*/}
-            {deletable ? (
-              <Tooltip placement="right" title={translate("${删除}${当前行}")}>
+            {deletable ?
+                deleteData? <Popconfirm
+                    placement="leftBottom"
+                    title={translate("${确定要[删除]选中数据吗}?")}
+                    onConfirm={() => {
+                      this.delete(record);
+                    }}
+                    okText={translate("${确定}")}
+                    cancelText={translate("${取消}")}
+                    okType={"danger"}
+                >  <Button
+                        disabled={disabled}
+                        danger
+                        type="primary"
+                        icon={<DeleteOutlined />}
+                        size="small" ></Button>
+                </Popconfirm> :
+                 <Tooltip placement="right" title={translate("${删除}${当前行}")}>
                 <Button
                   disabled={disabled}
                   danger
                   type="primary"
                   icon={<DeleteOutlined />}
                   size="small"
-                  onClick={() => this.delete(record)}
-                ></Button>
-              </Tooltip>
-            ) : (
+                  onClick={() => this.delete(record)}></Button></Tooltip>
+
+             : (
               ""
             )}
           </div>

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

@@ -261,6 +261,20 @@ export default class HcserviceV3 {
     return res.versions;
   }
 
+  static async requestFieldVersionList(serverKey: string, sourceId: string, code) {
+    let res = await Super.super({
+      url: `/v3/dtmpl/field-data/versions`,
+      serverKey,
+      query: {
+        pageNo: 1,
+        sourceId,
+        code,
+      },
+      method: "GET",
+    });
+    return res.versions;
+  }
+
   static async requestCommonDtmplData(
     serverKey: string,
     sourceId: string,
@@ -561,22 +575,24 @@ export default class HcserviceV3 {
   static async deleteData(
     serverKey: string,
     sourceId,
-    selectedRows: SelectedRow[]
+    selectedRows: SelectedRow[],mainCode?
   ) {
     const codes = this.getCodesOfSelectedRows(selectedRows);
-    return await this.deleteByCode(serverKey, sourceId, codes);
+    debugger
+    return await this.deleteByCode(serverKey, sourceId, codes,mainCode);
   }
 
-  static async deleteByCode(serverKey: string, sourceId, codes: string[]) {
+  static async deleteByCode(serverKey: string, sourceId, codes: string[],mainCode?) {
     let res = await Super.super({
       url: `/v3/ltmpl/data`,
       serverKey,
       data: {
         codes,
-        sourceId,
+        sourceId,mainCode
       },
       method: "DELETE",
     });
+    debugger
     if (res && res.status == "success") {
       message.success(translate("${删除成功}"), 1);
       return true;
@@ -658,6 +674,19 @@ export default class HcserviceV3 {
     return res;
   }
 
+  static async saveRatmplSelectCodes(serverKey: string, sourceId: string,mainCode, codes:string[] ) {
+    let res = await Super.super({
+      url: `/v3/ratmpl-select/data`,
+      serverKey,
+      method: "POST",
+      data: { codes,mainCode, sourceId },
+    });
+    if (res && res.status != "success") {
+      message.error(translate("${"+res.message+"}"));
+    }
+    return res;
+  }
+
   static async doCopy(
     serverKey: string,
     sourceId: string,

package/src/aldehyde/tmpl/interface.tsx

@@ -200,7 +200,8 @@ export type ButtonName =
   | "analysis"
   | "ltmplSelectAdd"
   | "reStat"
-  | "drilling";
+  | "drilling"
+    | "ratmplSelect";
 
 export type ChartType = "line" | "pie" | "column";
 export type GroupDisplayConfig =

package/src/aldehyde/units/index.tsx

@@ -447,10 +447,12 @@ export default {
   },
   toLogin() {
     let programCode = this.programCode();
+    const version = localStorage.getItem("version");
     if (programCode && programCode != "null" && programCode != "undefined") {
-      window.location.hash = "#/login2/" + programCode;
+      window.location.hash =
+        version === "v2" ? "#/login2/" + programCode : "#/login/" + programCode;
     } else {
-      window.location.hash = "#/login2";
+      window.location.hash = version === "v2" ? "#/login2/" : "#/login/";
     }
   },
   downloadFile(url, fileName) {