aldehyde 0.2.294 → 0.2.296

package/src/aldehyde/lowcode-components/data-number/index.tsx

@@ -99,7 +99,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         const temData = value?.[0]?.value?.[0]?.v1;
         setData(temData);
         return config;

package/src/aldehyde/lowcode-components/effectScatter-map/index.tsx

@@ -17,6 +17,10 @@ const defOption = {
         map: 'china',
         roam: true,
         zoom: 1,
+        scaleLimit: { // 地图缩放限制
+            min: 0.1,
+            max: 10,
+        },
         label: {
             normal: { show: false },
             emphasis: { show: false }
@@ -69,13 +73,13 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
     }
     const temData = data.map((r) => {
         const { config, value } = r;
-        const vNames = Object.keys(config).filter((r) => r.startsWith("v")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
+        const temVal = value.filter(v => v["v2"]);
         return {
-            name: config.d1,
-            data: vNames.map((r) => ({
-                name: config[r],
-                value: value[0]?.[r],
-            }))
+            name: config.v1,
+            data: temVal.map(v => {
+                const lonLat = v["v2"].split(",") || []; // 坐标经纬度；value:[经度，纬度，数值]
+                return { name: v["d1"], value: [lonLat[0], lonLat[1], v["v1"]] };
+            })
         };
     });
     return temData[0]?.data || [];
@@ -141,7 +145,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         setData(handleData(value));
         return config;
     };

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

@@ -97,7 +97,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         const temData = value?.[0]?.value?.[0]?.v1;
         setData(temData);
         return config;

package/src/aldehyde/lowcode-components/index.ts

@@ -11,6 +11,7 @@ import PieChart from "./pie-chart";
 import GaugeChart from "./gauge-chart";
 import LiquidChart from "./liquid-chart";
 import DataNumber from "./data-number";
+import BaseMap from "./base-map";
 import EffectScatterMap from "./effectScatter-map";
 import Border1 from "./border/border1";
 import Border2 from "./border/border2";
@@ -88,13 +89,14 @@ type CompoundedComponent = {
     CapsuleBarChart?: typeof CapsuleBarChart;
     CircularProgressChart?: typeof CircularProgressChart;
     ActTable?: typeof ActTable,
-    ProgressChart?: typeof ProgressChart
+    ProgressChart?: typeof ProgressChart,
+    BaseMap?: typeof BaseMap
 };
 
 const LowcodeComponents: CompoundedComponent = {
     LowcodeView, BaseText, BaseImage, DateTime, BaseColorBlock,
     FourAngleGlowBorder, LineChart, BarChart, ColumnChart, PieChart,
-    GaugeChart, LiquidChart, DataNumber, EffectScatterMap,
+    GaugeChart, LiquidChart, DataNumber, BaseMap, EffectScatterMap,
     Border1, Border2, Border3, Border4, Border5, Border6,
     Border7, Border8, Border9, Border10, Border11, Border12, Border13,
     Decoration1, Decoration2, Decoration3, Decoration4, Decoration5,

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

@@ -137,7 +137,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         const temData = handleData(value);
         setData(temData);
         return config;

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

@@ -113,7 +113,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         const temData = value?.[0]?.value?.[0]?.v1;
         setData(temData);
         return config;

package/src/aldehyde/lowcode-components/lowcode-view/index.tsx

@@ -6,7 +6,6 @@ import './component/font/FontGlobal.css';
 import ScreenFit from "./component/screen-fit";
 import { LayerManagerDataType, CanvasConfig } from "./interface";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
-import LowcodeConstant from "./lowcode-constant";
 import abstractDesignerLoader from "./component/abstract-designer-loader";
 import "./index.less";
 
@@ -28,16 +27,13 @@ const screenFitStyleMap: Record<string, CSSProperties> = {
     'full-y': { overflow: 'scroll hidden' }
 }
 
-const serverKey = LowcodeConstant.lowcodeDtmpl.serverKey;
-const sourceId = LowcodeConstant.lowcodeDtmpl.sourceId;
-
 interface Props {
     isFullScreen: boolean
 }
 
 const LowcodeView = (props: Props) => {
     const { isFullScreen } = props;
-    const { sourceId: code } = useParams();
+    const { ddpageId } = useParams();
     const canvasRef = useRef(null);
     const [loading, setLoading] = useState<boolean>(false);
     const [layerManager, setLayerManager] = useState<LayerManagerDataType>();
@@ -52,8 +48,8 @@ const LowcodeView = (props: Props) => {
     // 获取画面数据
     const getViewData = async () => {
         setLoading(true);
-        const dtmpl = await HcserviceV3.requestMstrucDtmplData(serverKey, sourceId, code, null);
-        const data = dtmpl?.fieldMap || {};
+        const { entity } = await HcserviceV3.requestDDpageData(ddpageId);
+        const data = entity?.fieldMap || {};
         const { layerManager, canvasManager } = data["内容"] ? JSON.parse(fromBase64(data["内容"]) || '{}') : {};
         setLayerManager(layerManager);
         setCanvasConfig(canvasManager);
@@ -61,13 +57,13 @@ const LowcodeView = (props: Props) => {
     }
 
     useEffect(() => {
-        if (code) {
+        if (ddpageId) {
             getViewData();
         } else {
             setLayerManager({});
             setCanvasConfig({});
         }
-    }, [code])
+    }, [ddpageId])
 
     const canvasDom = () => <div style={{
         width,

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

@@ -58,13 +58,9 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
     }
     const temData = data.map((r) => {
         const { config, value } = r;
-        const vNames = Object.keys(config).filter((r) => r.startsWith("v")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
         return {
-            name: config.d1,
-            data: vNames.map((r) => ({
-                name: config[r],
-                value: value[0]?.[r],
-            }))
+            name: config.v1,
+            data: value.map(v => ({ name: v["d1"], value: v["v1"] }))
         };
     });
     return temData || [];
@@ -144,7 +140,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         const temData = handleData(value);
         setData(temData);
         return config;
@@ -188,14 +185,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.color = color;
         option.title.show = !temData?.length;
         option.series = temData.map(r => ({
+            ...r,
             type: "pie",
             radius: [`${innerRadius}%`, `${radius}%`],
             center: [`${center?.x}%`, `${center?.y}%`],
             padAngle,
             label,
             labelLine,
-            roseType,
-            ...r
+            roseType
         }));
         chart.current.setOption(option, true);
     }

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

@@ -144,7 +144,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         const temData = value?.[0]?.value?.[0]?.v1 || 0;
         setData(temData);
         return config;

package/src/aldehyde/lowcode-components/text-scroller/index.tsx

@@ -74,7 +74,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     // 请求数据
     const getData = async () => {
-        const { entities: { config, value } } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId) || {};
+        const { config, value } = data || {};
         const temData = value?.[0]?.value?.[0]?.v1;
         setData(temData);
         return config;

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

@@ -81,14 +81,24 @@ export default class DtmplEditCard extends React.PureComponent<
     }
 
     loadConfigData = async () => {
-        const {sourceId, code, serverKey} = this.props;
+        const {sourceId, code, serverKey, addTmplId} = this.props;
         this.setState({
             loading: true,
         });
-        let dtmplConfig: DtmplConfig =  await HCDataSource.requestDtmplConfig(
+        let dtmplConfig: DtmplConfig = undefined;
+        if (code) {
+            dtmplConfig = await HCDataSource.requestDtmplConfig(
+                serverKey,
+                sourceId,
+                code
+            );
+        } else {
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(
                 serverKey,
-                sourceId,code
+                sourceId,
+                addTmplId
             );
+        }
         if (dtmplConfig.entity) {
             let dtmplData = dtmplConfig.entity;
             dtmplConfig.entity = undefined;

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

@@ -94,7 +94,7 @@ export default class DtmplEditPage extends React.PureComponent<
 
   async componentDidUpdate(prevProps) {
     const { dtmplConfig } = this.state;
-    debugger
+    //debugger
     if (prevProps && prevProps != this.props) {
       if (
         prevProps.sourceId != this.props.sourceId ||

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

@@ -427,6 +427,7 @@ class RelationTable extends React.PureComponent<
     };
     delete = async (record) => {
         const {value, fieldGroupConfig, onChange, serverKey} = this.props;
+        const {editings} = this.state;
         //追加
         const selectdDatas: DtmplData[] = [];
         const selectdCodes: string[] = [];
@@ -442,6 +443,11 @@ class RelationTable extends React.PureComponent<
         if (fieldGroupConfig.deleteData) {
             let result: boolean = await HcserviceV3.deleteByCode(serverKey, fieldGroupConfig.id, [record.code]);
         }
+
+        if(editings && editings.includes(record.code)) {
+            this.cancelRowEdit(record.code);
+        }
+
         onChange(fieldGroupConfig, selectdDatas);
     };
 

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

@@ -1230,4 +1230,15 @@ export default class HcserviceV3 {
       ProgramConfig.setProgramName_Logo(result.programName_Logo);
     }
   }
+
+  static async requestDDpageData(ddpageId: string) {
+    let res = await Super.super({
+      url: "/v3/ddpage/data",
+      method: "GET",
+      query: {
+        ddpageId,
+      },
+    });
+    return res;
+  }
 }

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

@@ -6,7 +6,6 @@ import {
     DtmplData,
     DtmplFormProps,
     FieldConfig,
-    FieldGroupConfig,
     LtmplConfig, SelectConfig,
 } from "./interface";
 import {FormInstance} from "antd";
@@ -357,19 +356,6 @@ TmplConfigAnalysis.buildInDtmplConfig = (
     if (!dtmplConfig.buildInFuncFields) {
         //先找到有业务的
         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) {

package/lib/lowcode-components/lowcode-view/lowcode-constant.d.ts

@@ -1,11 +0,0 @@
-declare function LowcodeConstant(): void;
-declare namespace LowcodeConstant {
-    var lowcodeDtmpl: {
-        name: string;
-        serverKey: string;
-        sourceId: string;
-        type: string;
-    };
-}
-export default LowcodeConstant;
-//# sourceMappingURL=lowcode-constant.d.ts.map

package/lib/lowcode-components/lowcode-view/lowcode-constant.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lowcode-constant.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/lowcode-constant.tsx"],"names":[],"mappings":"AAAA,iBAAS,eAAe,SAEvB;kBAFQ,eAAe;;;;;;;;AAGxB,eAAe,eAAe,CAAC"}

package/lib/lowcode-components/lowcode-view/lowcode-constant.js

@@ -1,10 +0,0 @@
-function LowcodeConstant() {
-}
-export default LowcodeConstant;
-LowcodeConstant.lowcodeDtmpl = {
-    name: '低代码页面数据请求',
-    serverKey: "DragDropPageServer",
-    sourceId: '446165759669608455',
-    type: 'dtmpl',
-};
-//# sourceMappingURL=lowcode-constant.js.map

package/lib/lowcode-components/lowcode-view/lowcode-constant.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lowcode-constant.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/lowcode-constant.tsx"],"names":[],"mappings":"AAAA,SAAS,eAAe;AAExB,CAAC;AACD,eAAe,eAAe,CAAC;AAG/B,eAAe,CAAC,YAAY,GAAG;IAC3B,IAAI,EAAE,WAAW;IACjB,SAAS,EAAE,oBAAoB;IAC/B,QAAQ,EAAE,oBAAoB;IAC9B,IAAI,EAAE,OAAO;CAChB,CAAA"}

package/src/aldehyde/lowcode-components/lowcode-view/lowcode-constant.tsx

@@ -1,12 +0,0 @@
-function LowcodeConstant() {
-
-}
-export default LowcodeConstant;
-
-
-LowcodeConstant.lowcodeDtmpl = {
-    name: '低代码页面数据请求',
-    serverKey: "DragDropPageServer",
-    sourceId: '446165759669608455',
-    type: 'dtmpl',
-}