aldehyde 0.2.277 → 0.2.278

package/src/aldehyde/lowcode-components/pie-chart/index.tsx

@@ -0,0 +1,122 @@
+import * as echarts from 'echarts';
+import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
+import _ from 'lodash';
+
+const defOption = {
+    color: ["#5470c6", "#91cc75", "#fac858", "#ee6666", "#73c0de"],
+    padAngle: 0,
+    tooltip: {
+        trigger: 'item'
+    },
+    legend: {
+        orient: 'vertical',
+        left: 'left'
+    },
+    series: [
+        {
+            name: 'Access From',
+            type: 'pie',
+            radius: ["0%", "50%"],
+            data: [
+                { value: 1048, name: 'Search Engine' },
+                { value: 735, name: 'Direct' },
+                { value: 580, name: 'Email' },
+                { value: 484, name: 'Union Ads' },
+                { value: 300, name: 'Video Ads' }
+            ]
+        }
+    ],
+};
+
+const legends = {
+    top: { top: 0 },
+    bottom: { bottom: 0 },
+    left: { left: 5, top: "center" },
+    right: { right: 5, top: "center" },
+    leftTop: { left: 5 },
+    rightTop: { right: 5 },
+    leftBottom: { left: 5, bottom: 0 },
+    rightBottom: { right: 5, bottom: 0 },
+}
+
+export interface ChartComponentStyle {
+    tooltip?: { show: boolean };
+    color?: string[];
+    grid?: { top: number, let: number, right: number, bottom: number };
+    legend?: { [key: string]: any };
+    padAngle?: number;
+    radius?: number;
+    innerRadius?: number;
+    label?: { [key: string]: any };
+    labelLine?: { [key: string]: any };
+}
+
+export interface ChartComponentProps {
+    style?: ChartComponentStyle;
+    base: { width: number, height: number }
+}
+
+export interface BaseTextComponentRef {
+    updateConfig: (newConfig: ChartComponentProps) => void;
+}
+
+const Index = forwardRef((props: ChartComponentProps, ref: ForwardedRef<BaseTextComponentRef>) => {
+    const [config, setConfig] = useState<ChartComponentStyle>(props.style || {});
+    const [size, setSize] = useState<{ width: number, height: number }>()
+    const chartRef = useRef<HTMLDivElement>(null);
+    const chart = useRef<any>(null);
+
+    useImperativeHandle(ref, () => ({
+        updateConfig: (newConfig) => {
+            const { base, style } = newConfig;
+            setConfig({ ...(style || {}) });
+            setSize({ width: base.width, height: base.height });
+        },
+    }));
+
+    // 窗口大小变化时重新调整图表大小
+    const handleResize = () => {
+        chart.current.resize({ animation: { duration: 500 } });
+    };
+
+    useEffect(() => {
+        chart.current = echarts.init(chartRef.current);
+        window.addEventListener('resize', handleResize);
+        return () => {
+            window.removeEventListener('resize', handleResize);
+            chart.current.dispose();
+        }
+    }, []);
+
+    const renderChart = () => {
+        const { legend, tooltip, radius, innerRadius, color, label, labelLine, padAngle } = config;
+        const option = _.cloneDeep(defOption);
+        option.legend = { ...legend, ...legends[legend?.position] };
+        option.tooltip = { trigger: "item", ...tooltip };
+        option.color = color;
+        option.series = option.series.map((r) => ({
+            ...r,
+            radius: [`${innerRadius}%`, `${radius}%`],
+            padAngle,
+            label,
+            labelLine
+        }));
+        chart.current.setOption(option, true);
+    }
+    useEffect(() => {
+        if (config) {
+            renderChart();
+        }
+    }, [config]);
+
+    useEffect(() => {
+        if (size) {
+            handleResize();
+        }
+    }, [size]);
+
+    return <div ref={chartRef} style={{ width: '100%', height: '100%' }} />;
+});
+
+export default Index;
+

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

@@ -23,6 +23,7 @@ import Scrollbars from "react-custom-scrollbars";
 import { LocaleContext } from "../locale/LocaleProvider";
 import Draggable from 'react-draggable';
 import DraggableModal from "./draggable-modal";
+import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 
 
 interface ModalEditorProps extends DtmplBaseProps {
@@ -314,11 +315,28 @@ export default class DtmplEditPage extends React.PureComponent<
       placement,
       maxColsOnRow,
       title,
-      serverKey,
+      serverKey,parentFormInstance
     } = this.props;
     const { dtmplConfig, id, dtmplData } = this.state;
 
     let title1 = title ? title : dtmplConfig ? dtmplConfig.title : "";
+
+    //根据 parentFormInstance 完善 dtmplConfig
+    if(parentFormInstance && dtmplConfig){//
+      if (!dtmplConfig.buildInFuncFields) {
+        dtmplConfig.buildInFuncFields = TmplConfigAnalysis.buildInFuncFields(dtmplConfig);
+      }
+      for (let field of dtmplConfig.buildInFuncFields){
+        if(field.relValueField ){
+          if(!field.baseCriteria){
+            field.baseCriteria={}
+          }
+          field.baseCriteria={...field.baseCriteria,"secondCriteria":parentFormInstance.getFieldValue(field.relValueField.id)};
+          field.configChanged=true;
+        }
+      }
+    }
+
     return (
       <>
         {" "}
@@ -348,6 +366,7 @@ export default class DtmplEditPage extends React.PureComponent<
                     showConfirm={false}
                     dtmplData={dtmplData}
                     onValuesChange={this.onValuesChange}
+                    parentFormInstance={parentFormInstance}
                 />
               </div>
             </Scrollbars>}
@@ -383,6 +402,7 @@ export default class DtmplEditPage extends React.PureComponent<
               showConfirm={false}
               dtmplData={dtmplData}
               onValuesChange={this.onValuesChange}
+              parentFormInstance={parentFormInstance}
             />
           </Drawer>
         ) : (
@@ -399,6 +419,7 @@ export default class DtmplEditPage extends React.PureComponent<
               showConfirm={false}
               dtmplData={dtmplData}
               onValuesChange={this.onValuesChange}
+              parentFormInstance={parentFormInstance}
             />
           </Card>
         )}

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

@@ -78,13 +78,13 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
   };
 
   goBackToLtmpl = () => {
-    this.props.navigate(-1);
+    //加tab页后不再支持返回列表
+    //this.props.navigate(-1);
     //this.props.navigate();
   };
 
   goNavigatel = () => {
-    this.props.navigate(window.location.hash);
-
+    this.props.navigate(window.location.hash.replace("#/","/"));
     //.reload();
   };
 

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

@@ -4,9 +4,9 @@ import {
   message, Layout,Table
 } from "antd";
 import {
-  DownloadOutlined,SettingOutlined, FundOutlined, LineChartOutlined,
+  ExportOutlined,SettingOutlined, FundOutlined, LineChartOutlined,
   PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined,
-  TableOutlined, UploadOutlined,
+  TableOutlined, ImportOutlined,
 } from "@ant-design/icons";
 import "./index.css";
 import {
@@ -717,7 +717,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
               marginLeft: "5px",
             }} //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
           >
-            {type == "ltmpl-data-excel" ? <DownloadOutlined /> : title}
+            {type == "ltmpl-data-excel" ? <ExportOutlined /> : title}
           </Button>
         </Tooltip>
       </Popover>
@@ -856,7 +856,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 }/${sourceId}/importer?menuId=${menuId}`}
                 target={"_blank"}
               >
-                <UploadOutlined />
+                <ImportOutlined />
               </Button>
             </Tooltip>
           ) : (

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

@@ -41,6 +41,7 @@ import CountingTag from "../controls/counting-tag";
 import { LocaleContext } from "../locale/LocaleProvider";
 import VerticalList from "../list/vertical-list";
 import {EntryControl} from "../index";
+import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 
 
 const FormItem = AntdForm.Item;
@@ -56,9 +57,9 @@ interface RelationTableProps {
   refreshId?: string;
   fieldGroupConfig: FieldGroupConfig;
   value: DtmplData[];
+  parentFormInstance?: FormInstance;
   onChange?: (fieldGroupConfig: FieldGroupConfig, value: DtmplData[]) => void;
   initCollapse?: boolean;
-  // rowEditForm?: FormInstance;
 }
 
 interface RelationTableStat {
@@ -153,7 +154,7 @@ class RelationTable extends React.PureComponent<
   };
 
   buildColumns = () => {
-    const { viewOrEdit, fieldGroupConfig, serverKey } = this.props;
+    const { viewOrEdit, fieldGroupConfig, serverKey,parentFormInstance } = this.props;
     const {
       buttons,
       fields,
@@ -177,11 +178,22 @@ class RelationTable extends React.PureComponent<
       if (s < 12 && item.sortable) {
         TableUnits.sort(column, itemType);
       }
+      //配置字段的 默认次过滤条件
+      if(item.relValueField ){
+        if(!item.baseCriteria){
+          item.baseCriteria={}
+        }
+        item.baseCriteria={...item.baseCriteria,"secondCriteria":parentFormInstance.getFieldValue(item.relValueField.id)};
+        item.configChanged=true;
+      }
       column["render"] = (text, record) => {
 
         return (editings.indexOf(record.code)>=0?
 
-            <FormItem style={{margin:0}} name={record.code+"_"+item.id} key={record.code+"_"+item.id}
+            <FormItem style={{margin:0}}
+                      name={record.code+"_"+item.id}
+                      key={record.code+"_"+item.id}
+                      rules={TmplConfigAnalysis.getRules(item,translate)}
             initialValue={record[item.id]} >
                 <EntryControl
                   serverKey={serverKey}
@@ -548,8 +560,6 @@ class RelationTable extends React.PureComponent<
     if (value) {
       datas = [...value];
     }
-
-    debugger
     let isAdd = true;
     for (let v of datas) {
       if (v.code == dtmplData.code) {
@@ -649,16 +659,17 @@ class RelationTable extends React.PureComponent<
    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];
         }
       }
+      this.cancelRowEdit(code);
+      this.handleRowEdit(dtmplData);
     }).catch(errorInfo => {
     })
-    this.cancelRowEdit(code);
-    this.handleRowEdit(dtmplData);
   }
 
   cancelRowEdit=(code:string)=>{
@@ -818,7 +829,7 @@ class RelationTable extends React.PureComponent<
       initCollapse,
       mainCode,
       serverKey,
-      showRightNav,
+      showRightNav,parentFormInstance
     } = this.props;
     const {
       pageSize,
@@ -922,6 +933,7 @@ class RelationTable extends React.PureComponent<
             onCancel={this.hiddenEntityEdit}
             sourceId={fieldGroupConfig.id}
             code={selectedCode}
+            parentFormInstance={parentFormInstance}
             onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd}
           />
         ) : (

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('select');
+SupportInputTypes.add('multiselect');
 SupportInputTypes.add('checkbox');
 SupportInputTypes.add('radio');
 SupportInputTypes.add('yes-no-select');

package/src/aldehyde/tmpl/interface.tsx

@@ -110,7 +110,6 @@ export interface FieldBase extends OrderableTmplBase {
 }
 
 export interface DtmplFormProps extends DtmplBaseProps {
-  parentId: string;
   dtmplConfig: DtmplConfig;
   dtmplData?: DtmplData;
   formRef: RefObject<FormInstance>;
@@ -118,6 +117,7 @@ export interface DtmplFormProps extends DtmplBaseProps {
   showHeader?: boolean;
   onFinish: (code: string|boolean) => void;
   onValuesChange?: () => void;
+
 }
 
 export interface CQueryConfig extends OrderableTmplBase {
@@ -333,6 +333,10 @@ export interface FieldGroupConfig extends OrderableTmplBase {
 
 export type SaveJumpType = "list" | "add" | "edit";
 
+// export interface OnValuesChangeExtendParams {
+//   parentFormInstance?:FormInstance
+// }
+
 export interface DtmplConfig extends TmplBase {
   autoSaveInterval?: number;
   //exportExcel fusionMode history dtmplSave refresh
@@ -352,7 +356,8 @@ export interface DtmplConfig extends TmplBase {
   onValuesChange?: (
     changedValues,
     allValues: DtmplData,
-    formInstance: FormInstance
+    formInstance: FormInstance,
+    // extendParams?:OnValuesChangeExtendParams
   ) => void;
   entity?: DtmplData;
   dynamic?: boolean;
@@ -674,6 +679,8 @@ export interface DtmplBaseProps extends TmplBaseProps {
   goDtmpl?: (code?: string) => void;
   maxColsOnRow?: number;
   addTmplId?: string;
+  parentId?: string;
+  parentFormInstance?: FormInstance;
 }
 
 export interface ChartConfig {

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

@@ -328,6 +328,24 @@ TmplConfigAnalysis.getRelMstrucFieldId = (
       : undefined;
   return rmstrucId;
 };
+TmplConfigAnalysis.buildInFuncFields=(dtmplConfig: DtmplConfig)=> {
+  let buildInFuncFields = [];
+  for (let group of dtmplConfig.groups) {
+    for (let field of group.fields) {
+      if (
+          (field.requiredRuleCriterias &&
+              field.requiredRuleCriterias.length > 0) ||
+          (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+          || field.relValueField
+      ) {
+        field.shouldUpdate = true;
+        buildInFuncFields.push(field);
+      }
+    }
+  }
+  return buildInFuncFields;
+}
+
 
 TmplConfigAnalysis.buildInDtmplConfig = (
   dtmplConfig: DtmplConfig,
@@ -336,20 +354,20 @@ TmplConfigAnalysis.buildInDtmplConfig = (
 ) => {
   if (!dtmplConfig.buildInFuncFields) {
     //先找到有业务的
-    let buildInFuncFields = [];
-    for (let group of dtmplConfig.groups) {
-      for (let field of group.fields) {
-        if (
-          (field.requiredRuleCriterias &&
-            field.requiredRuleCriterias.length > 0) ||
-          (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
-            || field.relValueField
-        ) {
-          field.shouldUpdate = true;
-          buildInFuncFields.push(field);
-        }
-      }
-    }
+    let buildInFuncFields = TmplConfigAnalysis.buildInFuncFields(dtmplConfig);
+    // for (let group of dtmplConfig.groups) {
+    //   for (let field of group.fields) {
+    //     if (
+    //       (field.requiredRuleCriterias &&
+    //         field.requiredRuleCriterias.length > 0) ||
+    //       (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+    //         || field.relValueField
+    //     ) {
+    //       field.shouldUpdate = true;
+    //       buildInFuncFields.push(field);
+    //     }
+    //   }
+    // }
     dtmplConfig.buildInFuncFields = buildInFuncFields;
   }
   if (dtmplConfig.buildInFuncFields.length > 0) {
@@ -419,6 +437,26 @@ TmplConfigAnalysis.buildInDtmplConfig = (
   }
 };
 
+  TmplConfigAnalysis.getRules=(fieldConfig:FieldConfig,translate)=>{
+    let rules=[];
+    let title=fieldConfig.title;
+    if(fieldConfig.required){
+      rules.push({
+        required: true,
+        message: translate("${请输入}${" + title + "}"),
+      });
+    }
+
+    let rulePattern=fieldConfig.rules[0]?.pattern;
+    if(rulePattern){
+      rules.push({
+        pattern:rulePattern,
+        message:translate("${" + title + "}${格式有误}"),
+      })
+    }
+    return rules;
+  }
+
 TmplConfigAnalysis.buildInCtmplConfig = (
     ltmplConfig:SelectConfig,
     criteriaData,
@@ -488,4 +526,6 @@ TmplConfigAnalysis.buildInCtmplConfig = (
   }
 };
 
+
+
 export default TmplConfigAnalysis;