lxm1993 发布系统代码 [TrainSys，网页端]

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/components/chart-control/chart-control.d.ts

+import { PropType } from 'vue';
+import { ChartModel } from '@ibiz-template/model';
+declare const _default: import("vue").DefineComponent<{
+    modelData: {
+        type: typeof ChartModel;
+        required: true;
+    };
+    context: {
+        type: PropType<IContext>;
+        required: true;
+    };
+    params: {
+        type: PropType<IParams>;
+        default: () => {};
+    };
+}, {
+    c: import("../../controller/chart-controller").ChartController;
+    ns: import("@ibiz-template/core").Namespace;
+}, {}, {}, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: typeof ChartModel;
+        required: true;
+    };
+    context: {
+        type: PropType<IContext>;
+        required: true;
+    };
+    params: {
+        type: PropType<IParams>;
+        default: () => {};
+    };
+}>>, {
+    params: IParams;
+}>;
+export default _default;

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/components/chart-view/chart-view.d.ts

+import { IModal } from '@ibiz-template/runtime';
+import { PropType } from 'vue';
+declare const _default: import("vue").DefineComponent<{
+    context: PropType<IContext>;
+    params: {
+        type: PropType<IParams>;
+        default: () => {};
+    };
+    modelPath: {
+        type: StringConstructor;
+        required: true;
+    };
+    modal: {
+        type: PropType<IModal>;
+    };
+}, {
+    c: import("../../controller/chart-view-controller").ChartViewController;
+}, {}, {}, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
+    context: PropType<IContext>;
+    params: {
+        type: PropType<IParams>;
+        default: () => {};
+    };
+    modelPath: {
+        type: StringConstructor;
+        required: true;
+    };
+    modal: {
+        type: PropType<IModal>;
+    };
+}>>, {
+    params: IParams;
+}>;
+export default _default;

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/chart-controller.d.ts

+import { ControlController } from '@ibiz-template/controller';
+import { EChartsOption, EChartsType } from 'echarts';
+import { ChartModel } from '@ibiz-template/model';
+import { ChartNerve } from './nerve/chart-nerve';
+import { ChartService } from '../service/chart-service';
+export declare class ChartController extends ControlController<ChartModel> {
+    /**
+     * 图表神经系统
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:02
+     * @type {ChartNerve}
+     */
+    nerve: ChartNerve;
+    /**
+     * 图表服务
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:13
+     * @type {ChartService}
+     */
+    service: ChartService;
+    /**
+     * 图表实例
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:45
+     * @type {(EChartsType | null)}
+     */
+    chart: EChartsType | null;
+    /**
+     * 图表id
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:22
+     * @type {string}
+     */
+    chartId: string;
+    /**
+     * 图表静态配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:32
+     * @type {EChartsOption}
+     */
+    chartStaticOption: EChartsOption;
+    /**
+     * 数据集合
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-07 16:04:34
+     * @type {IData[]}
+     */
+    items: IData[];
+    /**
+     * 请求参数
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-07 16:04:28
+     */
+    queryParams: {
+        page: number;
+        size: number;
+        query: string;
+    };
+    /**
+     * 图表部件宽度
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-11 15:04:23
+     * @type {string}
+     */
+    width: string;
+    /**
+     * 图表部件高度
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-11 15:04:37
+     * @type {string}
+     */
+    height: string;
+    /**
+     * 创建图表神经系统
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:24
+     * @protected
+     * @return {*}  {ChartNerve}
+     */
+    protected createNerve(): ChartNerve;
+    /**
+     * 初始化配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:41
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected onInit(): Promise<void>;
+    /**
+     * 重新渲染图表
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 18:04:35
+     */
+    resizeChart(): void;
+    /**
+     * 初始化图表静态配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:52
+     */
+    initChartStaticOption(): void;
+    /**
+     * 加载数据
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:13
+     * @param {IParams} params
+     */
+    load(): Promise<void>;
+    destroy(): void;
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/chart-view-controller.d.ts

+import { ViewController } from '@ibiz-template/controller';
+import { ChartViewModel } from '@ibiz-template/model';
+import { ChartViewNerve } from './nerve/chart-view-nerve';
+/**
+ * 图表视图控制器
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 17:04:29
+ * @export
+ * @class ChartViewController
+ * @extends {ViewController<ChartViewModel>}
+ */
+export declare class ChartViewController extends ViewController<ChartViewModel> {
+    nerve: ChartViewNerve;
+    protected createNerve(): ChartViewNerve;
+    protected onInit(): Promise<void>;
+    /**
+     * 视图加载方法
+     *
+     * @return {*}  {Promise<IData[]>}
+     * @memberof ChartViewController
+     */
+    load(): Promise<void>;
+    /**
+     * 刷新视图
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-07 17:04:41
+     * @return {*}  {Promise<void>}
+     */
+    refresh(): Promise<void>;
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/interface/i-chart-ability.d.ts

+import { IControlAbility } from '@ibiz-template/controller';
+/**
+ * 图表能力
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:31
+ * @export
+ * @interface IChartAbility
+ * @extends {IControlAbility}
+ */
+export interface IChartAbility extends IControlAbility {
+    load(): Promise<void>;
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/interface/i-chart-event.d.ts

+import { IControlEvent } from '@ibiz-template/controller';
+/**
+ * 图表事件
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:46
+ * @export
+ * @interface IChartEvent
+ * @extends {IControlEvent}
+ */
+export interface IChartEvent extends IControlEvent {
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/interface/i-chart-view-ability.d.ts

+import { IViewAbility } from '@ibiz-template/controller';
+/**
+ * 图表视图能力
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 17:04:09
+ * @export
+ * @interface IChartViewAbility
+ * @extends {IViewAbility}
+ */
+export interface IChartViewAbility extends IViewAbility {
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/interface/i-chart-view-event.d.ts

+import { IViewEvent } from '@ibiz-template/controller';
+/**
+ * 图表视图事件
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 17:04:26
+ * @export
+ * @interface IChartViewEvent
+ * @extends {IViewEvent}
+ */
+export interface IChartViewEvent extends IViewEvent {
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/nerve/chart-nerve.d.ts

+import { ControlNerve } from '@ibiz-template/controller';
+import { ChartController } from '../chart-controller';
+import { ChartNeuron } from '../neuron/chart-neuron';
+/**
+ * 图表神经系统
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:03
+ * @export
+ * @class ChartNerve
+ * @extends {ControlNerve<ChartNeuron, ChartController>}
+ */
+export declare class ChartNerve extends ControlNerve<ChartNeuron, ChartController> {
+    protected createNeuron(): ChartNeuron;
+    protected bindAbility(): {
+        load: () => Promise<void>;
+    };
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/nerve/chart-view-nerve.d.ts

+import { Neuron, ViewNerve } from '@ibiz-template/controller';
+import { ChartViewController } from '../chart-view-controller';
+import { ChartViewNeuron } from '../neuron/chart-view-neuron';
+import { ChartNeuron } from '../neuron/chart-neuron';
+/**
+ * 图表视图神经系统
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 17:04:29
+ * @export
+ * @class ChartViewNerve
+ * @extends {ViewNerve<ChartViewNeuron, ChartViewController>}
+ */
+export declare class ChartViewNerve extends ViewNerve<ChartViewNeuron, ChartViewController> {
+    chart: ChartNeuron;
+    protected createNeuron(): ChartViewNeuron;
+    inclusive(name: string): boolean;
+    connect(name: string, neuron: Neuron): void;
+    destroy(): void;
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/neuron/chart-neuron.d.ts

+import { Neuron } from '@ibiz-template/controller';
+import { IChartAbility } from '../interface/i-chart-ability';
+import { IChartEvent } from '../interface/i-chart-event';
+/**
+ * 图表神经元
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:17
+ * @export
+ * @class ChartNeuron
+ * @extends {Neuron<IChartEvent, IChartAbility>}
+ */
+export declare class ChartNeuron extends Neuron<IChartEvent, IChartAbility> {
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/neuron/chart-view-neuron.d.ts

+import { Neuron } from '@ibiz-template/controller';
+import { IChartViewEvent } from '../interface/i-chart-view-event';
+import { IChartViewAbility } from '../interface/i-chart-view-ability';
+/**
+ * 图表视图神经元
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 17:04:06
+ * @export
+ * @class ChartViewNeuron
+ * @extends {Neuron<IChartViewEvent, IChartViewAbility>}
+ */
+export declare class ChartViewNeuron extends Neuron<IChartViewEvent, IChartViewAbility> {
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/controller/utils/chart-util.d.ts

+import { IPSChartAxis, IPSDEChartLegend, IPSDEChartTitle } from '@ibiz-template/model';
+import { EChartsOption, LegendComponentOption, TitleComponentOption, XAXisComponentOption, YAXisComponentOption } from 'echarts';
+/**
+ * 解析自定义配置
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:52
+ * @export
+ * @param {IModel} userParams
+ * @return {*}
+ */
+export declare function parseUserParams(userParams: IModel): EChartsOption;
+/**
+ * 生成标题配置
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:06
+ * @export
+ * @param {IPSDEChartTitle} chartTitle
+ * @return {*}
+ */
+export declare function generateTitleOption(chartTitle: IPSDEChartTitle): TitleComponentOption;
+/**
+ * 生成图例配置
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:21
+ * @export
+ * @param {IPSDEChartLegend} chartLegend
+ * @return {*}
+ */
+export declare function generateLegendOption(chartLegend: IPSDEChartLegend): LegendComponentOption;
+/**
+ * 生成坐标轴label配置
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:37
+ * @export
+ * @param {number} dataShowMode
+ * @return {*}
+ */
+export declare function generateAxisLabelOption(dataShowMode: number): {
+    axisLabel: {
+        formatter: (value: string) => string;
+        rotate: number;
+    };
+};
+/**
+ * 生成x轴配置
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:57
+ * @export
+ * @param {IPSChartAxis[]} chartXAxisList
+ * @return {*}
+ */
+export declare function generateXAxisOption(chartXAxisList: IPSChartAxis[]): XAXisComponentOption[];
+/**
+ * 生成y轴配置
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:16
+ * @export
+ * @param {IPSChartAxis[]} chartYAxisList
+ * @return {*}
+ */
+export declare function generateYAxisOption(chartYAxisList: IPSChartAxis[]): YAXisComponentOption[];

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/global.d.ts

+import { PluginStaticResource } from '@ibiz-template/runtime';
+declare const resource: PluginStaticResource;
+export { resource };

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/index.d.ts

+import { VueConstructor } from 'vue';
+declare const _default: {
+    mateUrl: string;
+    install(vue: VueConstructor): void;
+};
+export default _default;

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/interface/code-list-map.d.ts

+/**
+ * 代码表映射
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:42
+ * @export
+ * @interface CodeListMap
+ */
+export interface CodeListMap {
+    catalog?: Map<string | number, string>;
+    series?: Map<string | number, string>;
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/interface/tooltip-formatter-param.d.ts

+/**
+ * tooltip格式化函数参数
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-19 09:04:04
+ * @export
+ * @interface TooltipFormatterParam
+ */
+export interface TooltipFormatterParam {
+    seriesName: string;
+    dimensionNames: string[];
+    value: string[];
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/provider/chart-provider.d.ts

+import { IControlProvider } from '@ibiz-template/controller';
+/**
+ * 图表适配器
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:11
+ * @export
+ * @class ChartProvider
+ * @implements {IControlProvider}
+ */
+export declare class ChartProvider implements IControlProvider {
+    component: string;
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/provider/chart-view-provider.d.ts

+import { IViewProvider } from '@ibiz-template/controller';
+/**
+ * 图表视图适配器
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 17:04:29
+ * @export
+ * @class ChartViewProvider
+ * @implements {IViewProvider}
+ */
+export declare class ChartViewProvider implements IViewProvider {
+    component: string;
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/service/chart-service.d.ts

+import { ControlService } from '@ibiz-template/service';
+import { IHttpResponse } from '@ibiz-template/core';
+import { ChartModel, IPSDEChartSeries } from '@ibiz-template/model';
+import { DatasetComponentOption, EChartsOption, SeriesOption } from 'echarts';
+import { CodeListMap } from '../interface/code-list-map';
+/**
+ * 图表服务
+ *
+ * @author zhanghengfeng
+ * @date 2023-04-03 16:04:23
+ * @export
+ * @class ChartService
+ * @extends {ControlService<ChartModel>}
+ */
+export declare class ChartService extends ControlService<ChartModel> {
+    /**
+     * 序列列表
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:38
+     * @type {IPSDEChartSeries[]}
+     */
+    seriesList: IPSDEChartSeries[];
+    constructor(model: ChartModel);
+    /**
+     * 获取数据
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:11
+     * @param {IContext} context
+     * @param {IParams} [params={}]
+     * @return {*}  {Promise<IHttpResponse>}
+     */
+    fetch(context: IContext, params?: IParams): Promise<IHttpResponse>;
+    /**
+     * 获取所有代码表映射
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:21
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}
+     */
+    getAllCodeListMap(context: IContext, params: IParams): Promise<CodeListMap[]>;
+    /**
+     * 生成数据集配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:37
+     * @param {IPSDEChartSeries} series
+     * @param {IData[]} data
+     * @param {CodeListMap} map
+     * @return {*}
+     */
+    generateDatasetOption(series: IPSDEChartSeries, data: IData[], map: CodeListMap): DatasetComponentOption;
+    /**
+     * 生成图表配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:49
+     * @param {IData[]} data
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}
+     */
+    generateChartOption(data: IData[], context: IContext, params: IParams): Promise<EChartsOption>;
+    /**
+     * 生成柱状图序列配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:13
+     * @param {IPSDEChartSeries} series
+     * @param {IData[]} data
+     * @param {CodeListMap} map
+     * @param {number} index
+     * @return {*}
+     */
+    generateBarSeriesOption(series: IPSDEChartSeries, data: IData[], map: CodeListMap, index: number): SeriesOption[];
+    /**
+     * 生成折线图序列配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:32
+     * @param {IPSDEChartSeries} series
+     * @param {IData[]} data
+     * @param {CodeListMap} map
+     * @param {number} index
+     * @return {*}
+     */
+    generateLineSeriesOption(series: IPSDEChartSeries, data: IData[], map: CodeListMap, index: number): SeriesOption[];
+    /**
+     * 生成饼图序列配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:44
+     * @param {IPSDEChartSeries} series
+     * @param {IData[]} data
+     * @param {CodeListMap} map
+     * @param {number} index
+     * @return {*}
+     */
+    generatePieSeriesOption(series: IPSDEChartSeries, data: IData[], map: CodeListMap, index: number): SeriesOption[];
+    /**
+     * 生成漏斗图序列配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:03
+     * @param {IPSDEChartSeries} series
+     * @param {IData[]} data
+     * @param {CodeListMap} map
+     * @param {number} index
+     * @return {*}
+     */
+    generateFunnelSeriesOption(series: IPSDEChartSeries, data: IData[], map: CodeListMap, index: number): SeriesOption[];
+    /**
+     * 生成散点图序列配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:25
+     * @param {IPSDEChartSeries} series
+     * @param {IData[]} data
+     * @param {CodeListMap} map
+     * @param {number} index
+     * @return {*}
+     */
+    generateScatterSeriesOption(series: IPSDEChartSeries, data: IData[], map: CodeListMap, index: number): SeriesOption[];
+    /**
+     * 生成雷达图序列配置
+     *
+     * @author zhanghengfeng
+     * @date 2023-04-03 16:04:47
+     * @param {IPSDEChartSeries} series
+     * @param {IData[]} data
+     * @param {CodeListMap} map
+     * @return {*}
+     */
+    generateRadarSeriesOption(series: IPSDEChartSeries, data: IData[], map: CodeListMap): {
+        series: SeriesOption[];
+        radar: {
+            indicator: {
+                name: string;
+                max: number;
+            }[];
+        };
+    };
+}

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/vue-util/use-chart-controller.d.ts

+import { ChartModel } from '@ibiz-template/model';
+import { ChartController } from '../controller/chart-controller';
+export declare function useChartController(vue: Vue, model: ChartModel, context: IContext, params?: IParams): ChartController;

app_Web/public/plugins/@ibiz-template-package/vue2-de-chart-view@0.0.1/dist/types/vue-util/use-chart-view-controller.d.ts

+import { ChartViewController } from '../controller/chart-view-controller';
+export declare function useChartViewController(vue: Vue, path: string): ChartViewController;

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/TestTreeView_TreeView.json

@@ -50,16 +50,16 @@
     "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
   },
   "getPSControls" : [ {
-    "codeName" : "MobTreeViewnode1_cm",
+    "codeName" : "MobTreeViewnode3_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树上下文菜单",
-    "name" : "node1_cm",
+    "name" : "node3_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
     },
     "getPSControlParam" : {
-      "id" : "node1_cm"
+      "id" : "node3_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -76,11 +76,11 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node1_cm_deuiaction1"
+        "id" : "node3_cm_deuiaction1"
       },
       "getPSControlLogics" : [ {
         "itemName" : "deuiaction1",
-        "logicTag" : "node1_cm",
+        "logicTag" : "node3_cm",
         "logicType" : "SCRIPT",
         "name" : "logic11",
         "scriptCode" : "true",
@@ -154,11 +154,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node1_cm_deuiaction2"
+          "id" : "node3_cm_deuiaction2"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction2",
-          "logicTag" : "node1_cm",
+          "logicTag" : "node3_cm",
           "logicType" : "SCRIPT",
           "name" : "logic222",
           "scriptCode" : "false",
@@ -232,7 +232,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction4"
+            "id" : "node3_cm_deuiaction4"
           },
           "getPSSysImage" : {
             "glyph" : "xf00d@FontAwesome",
@@ -287,7 +287,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction5"
+            "id" : "node3_cm_deuiaction5"
           },
           "getPSUIAction" : {
             "actionTarget" : "NONE",
@@ -318,7 +318,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node1_cm_deuiaction3"
+          "id" : "node3_cm_deuiaction3"
         },
         "getPSSysImage" : {
           "glyph" : "xf021@FontAwesome",
@@ -361,16 +361,16 @@
     "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "MobTreeViewnode3_cm",
+    "codeName" : "MobTreeViewnode1_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树上下文菜单",
-    "name" : "node3_cm",
+    "name" : "node1_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
     },
     "getPSControlParam" : {
-      "id" : "node3_cm"
+      "id" : "node1_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -387,11 +387,11 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node3_cm_deuiaction1"
+        "id" : "node1_cm_deuiaction1"
       },
       "getPSControlLogics" : [ {
         "itemName" : "deuiaction1",
-        "logicTag" : "node3_cm",
+        "logicTag" : "node1_cm",
         "logicType" : "SCRIPT",
         "name" : "logic11",
         "scriptCode" : "true",
@@ -465,11 +465,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node3_cm_deuiaction2"
+          "id" : "node1_cm_deuiaction2"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction2",
-          "logicTag" : "node3_cm",
+          "logicTag" : "node1_cm",
           "logicType" : "SCRIPT",
           "name" : "logic222",
           "scriptCode" : "false",
@@ -543,7 +543,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction4"
+            "id" : "node1_cm_deuiaction4"
           },
           "getPSSysImage" : {
             "glyph" : "xf00d@FontAwesome",
@@ -598,7 +598,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction5"
+            "id" : "node1_cm_deuiaction5"
           },
           "getPSUIAction" : {
             "actionTarget" : "NONE",
@@ -629,7 +629,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node3_cm_deuiaction3"
+          "id" : "node1_cm_deuiaction3"
         },
         "getPSSysImage" : {
           "glyph" : "xf021@FontAwesome",
@@ -1159,11 +1159,19 @@
     "selected" : false,
     "id" : "node1"
   }, {
+    "getChildCntPSAppDEField" : {
+      "name" : "AMOUNT",
+      "codeName" : "Amount"
+    },
     "counterMode" : 0,
     "getIdPSAppDEField" : {
       "name" : "TESTID",
       "codeName" : "TESTId"
     },
+    "getLeafFlagPSAppDEField" : {
+      "name" : "NUMBER1",
+      "codeName" : "Number1"
+    },
     "maxSize" : -1,
     "name" : "动态集合",
     "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json

@@ -140,16 +140,16 @@
       "id" : "TREE"
     },
     "getPSControls" : [ {
-      "codeName" : "MobPickupTreeViewnode1_cm",
+      "codeName" : "MobPickupTreeViewnode3_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node1_cm",
+      "name" : "node3_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node1_cm"
+        "id" : "node3_cm"
       },
       "getPSDEToolbarItems" : [ {
         "caption" : "二级",
@@ -167,7 +167,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction5"
+              "id" : "node3_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -198,7 +198,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction3"
+            "id" : "node3_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -241,16 +241,16 @@
       "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
       "modeltype" : "PSDETOOLBAR"
     }, {
-      "codeName" : "MobPickupTreeViewnode3_cm",
+      "codeName" : "MobPickupTreeViewnode1_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node3_cm",
+      "name" : "node1_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node3_cm"
+        "id" : "node1_cm"
       },
       "getPSDEToolbarItems" : [ {
         "caption" : "二级",
@@ -268,7 +268,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction5"
+              "id" : "node1_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -299,7 +299,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction3"
+            "id" : "node1_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -619,11 +619,19 @@
       "selected" : false,
       "id" : "node1"
     }, {
+      "getChildCntPSAppDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      },
       "counterMode" : 0,
       "getIdPSAppDEField" : {
         "name" : "TESTID",
         "codeName" : "TESTId"
       },
+      "getLeafFlagPSAppDEField" : {
+        "name" : "NUMBER1",
+        "codeName" : "Number1"
+      },
       "maxSize" : -1,
       "name" : "动态集合",
       "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobTreeView.json

@@ -293,16 +293,16 @@
       "id" : "TREEVIEW"
     },
     "getPSControls" : [ {
-      "codeName" : "MobTreeViewnode1_cm",
+      "codeName" : "MobTreeViewnode3_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node1_cm",
+      "name" : "node3_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node1_cm"
+        "id" : "node3_cm"
       },
       "getPSDEToolbarItems" : [ {
         "getCapPSLanguageRes" : {
@@ -319,11 +319,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node1_cm_deuiaction1"
+          "id" : "node3_cm_deuiaction1"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction1",
-          "logicTag" : "node1_cm",
+          "logicTag" : "node3_cm",
           "logicType" : "SCRIPT",
           "name" : "logic11",
           "scriptCode" : "true",
@@ -397,11 +397,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction2"
+            "id" : "node3_cm_deuiaction2"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction2",
-            "logicTag" : "node1_cm",
+            "logicTag" : "node3_cm",
             "logicType" : "SCRIPT",
             "name" : "logic222",
             "scriptCode" : "false",
@@ -475,7 +475,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction4"
+              "id" : "node3_cm_deuiaction4"
             },
             "getPSSysImage" : {
               "glyph" : "xf00d@FontAwesome",
@@ -530,7 +530,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction5"
+              "id" : "node3_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -561,7 +561,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction3"
+            "id" : "node3_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -604,16 +604,16 @@
       "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
       "modeltype" : "PSDETOOLBAR"
     }, {
-      "codeName" : "MobTreeViewnode3_cm",
+      "codeName" : "MobTreeViewnode1_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node3_cm",
+      "name" : "node1_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node3_cm"
+        "id" : "node1_cm"
       },
       "getPSDEToolbarItems" : [ {
         "getCapPSLanguageRes" : {
@@ -630,11 +630,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node3_cm_deuiaction1"
+          "id" : "node1_cm_deuiaction1"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction1",
-          "logicTag" : "node3_cm",
+          "logicTag" : "node1_cm",
           "logicType" : "SCRIPT",
           "name" : "logic11",
           "scriptCode" : "true",
@@ -708,11 +708,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction2"
+            "id" : "node1_cm_deuiaction2"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction2",
-            "logicTag" : "node3_cm",
+            "logicTag" : "node1_cm",
             "logicType" : "SCRIPT",
             "name" : "logic222",
             "scriptCode" : "false",
@@ -786,7 +786,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction4"
+              "id" : "node1_cm_deuiaction4"
             },
             "getPSSysImage" : {
               "glyph" : "xf00d@FontAwesome",
@@ -841,7 +841,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction5"
+              "id" : "node1_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -872,7 +872,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction3"
+            "id" : "node1_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -1402,11 +1402,19 @@
       "selected" : false,
       "id" : "node1"
     }, {
+      "getChildCntPSAppDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      },
       "counterMode" : 0,
       "getIdPSAppDEField" : {
         "name" : "TESTID",
         "codeName" : "TESTId"
       },
+      "getLeafFlagPSAppDEField" : {
+        "name" : "NUMBER1",
+        "codeName" : "Number1"
+      },
       "maxSize" : -1,
       "name" : "动态集合",
       "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTTreeView.json

@@ -140,16 +140,16 @@
       "id" : "TREE"
     },
     "getPSControls" : [ {
-      "codeName" : "TreeViewnode1_cm",
+      "codeName" : "TreeViewnode3_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node1_cm",
+      "name" : "node3_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node1_cm"
+        "id" : "node3_cm"
       },
       "getPSDEToolbarItems" : [ {
         "getCapPSLanguageRes" : {
@@ -166,11 +166,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node1_cm_deuiaction1"
+          "id" : "node3_cm_deuiaction1"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction1",
-          "logicTag" : "node1_cm",
+          "logicTag" : "node3_cm",
           "logicType" : "SCRIPT",
           "name" : "logic11",
           "scriptCode" : "true",
@@ -244,11 +244,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction2"
+            "id" : "node3_cm_deuiaction2"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction2",
-            "logicTag" : "node1_cm",
+            "logicTag" : "node3_cm",
             "logicType" : "SCRIPT",
             "name" : "logic222",
             "scriptCode" : "false",
@@ -322,7 +322,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction4"
+              "id" : "node3_cm_deuiaction4"
             },
             "getPSSysImage" : {
               "glyph" : "xf00d@FontAwesome",
@@ -377,7 +377,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction5"
+              "id" : "node3_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -408,7 +408,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction3"
+            "id" : "node3_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -451,16 +451,16 @@
       "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
       "modeltype" : "PSDETOOLBAR"
     }, {
-      "codeName" : "TreeViewnode3_cm",
+      "codeName" : "TreeViewnode1_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node3_cm",
+      "name" : "node1_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node3_cm"
+        "id" : "node1_cm"
       },
       "getPSDEToolbarItems" : [ {
         "getCapPSLanguageRes" : {
@@ -477,11 +477,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node3_cm_deuiaction1"
+          "id" : "node1_cm_deuiaction1"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction1",
-          "logicTag" : "node3_cm",
+          "logicTag" : "node1_cm",
           "logicType" : "SCRIPT",
           "name" : "logic11",
           "scriptCode" : "true",
@@ -555,11 +555,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction2"
+            "id" : "node1_cm_deuiaction2"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction2",
-            "logicTag" : "node3_cm",
+            "logicTag" : "node1_cm",
             "logicType" : "SCRIPT",
             "name" : "logic222",
             "scriptCode" : "false",
@@ -633,7 +633,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction4"
+              "id" : "node1_cm_deuiaction4"
             },
             "getPSSysImage" : {
               "glyph" : "xf00d@FontAwesome",
@@ -688,7 +688,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction5"
+              "id" : "node1_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -719,7 +719,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction3"
+            "id" : "node1_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -1249,11 +1249,19 @@
       "selected" : false,
       "id" : "node1"
     }, {
+      "getChildCntPSAppDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      },
       "counterMode" : 0,
       "getIdPSAppDEField" : {
         "name" : "TESTID",
         "codeName" : "TESTId"
       },
+      "getLeafFlagPSAppDEField" : {
+        "name" : "NUMBER1",
+        "codeName" : "Number1"
+      },
       "maxSize" : -1,
       "name" : "动态集合",
       "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobPickupView.json

@@ -162,16 +162,16 @@
           "id" : "TREE"
         },
         "getPSControls" : [ {
-          "codeName" : "MobPickupTreeViewnode1_cm",
+          "codeName" : "MobPickupTreeViewnode3_cm",
           "controlType" : "CONTEXTMENU",
           "logicName" : "树上下文菜单",
-          "name" : "node1_cm",
+          "name" : "node3_cm",
           "getPSAppDataEntity" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
           },
           "getPSControlParam" : {
-            "id" : "node1_cm"
+            "id" : "node3_cm"
           },
           "getPSDEToolbarItems" : [ {
             "caption" : "二级",
@@ -189,7 +189,7 @@
                 "noPrivDisplayMode" : 2,
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "node1_cm_deuiaction5"
+                  "id" : "node3_cm_deuiaction5"
                 },
                 "getPSUIAction" : {
                   "actionTarget" : "NONE",
@@ -220,7 +220,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node1_cm_deuiaction3"
+                "id" : "node3_cm_deuiaction3"
               },
               "getPSSysImage" : {
                 "glyph" : "xf021@FontAwesome",
@@ -263,16 +263,16 @@
           "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
           "modeltype" : "PSDETOOLBAR"
         }, {
-          "codeName" : "MobPickupTreeViewnode3_cm",
+          "codeName" : "MobPickupTreeViewnode1_cm",
           "controlType" : "CONTEXTMENU",
           "logicName" : "树上下文菜单",
-          "name" : "node3_cm",
+          "name" : "node1_cm",
           "getPSAppDataEntity" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
           },
           "getPSControlParam" : {
-            "id" : "node3_cm"
+            "id" : "node1_cm"
           },
           "getPSDEToolbarItems" : [ {
             "caption" : "二级",
@@ -290,7 +290,7 @@
                 "noPrivDisplayMode" : 2,
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "node3_cm_deuiaction5"
+                  "id" : "node1_cm_deuiaction5"
                 },
                 "getPSUIAction" : {
                   "actionTarget" : "NONE",
@@ -321,7 +321,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node3_cm_deuiaction3"
+                "id" : "node1_cm_deuiaction3"
               },
               "getPSSysImage" : {
                 "glyph" : "xf021@FontAwesome",
@@ -641,11 +641,19 @@
           "selected" : false,
           "id" : "node1"
         }, {
+          "getChildCntPSAppDEField" : {
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
+          },
           "counterMode" : 0,
           "getIdPSAppDEField" : {
             "name" : "TESTID",
             "codeName" : "TESTId"
           },
+          "getLeafFlagPSAppDEField" : {
+            "name" : "NUMBER1",
+            "codeName" : "Number1"
+          },
           "maxSize" : -1,
           "name" : "动态集合",
           "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr3MobMPickupView.json

@@ -162,16 +162,16 @@
           "id" : "TREE"
         },
         "getPSControls" : [ {
-          "codeName" : "MobPickupTreeViewnode1_cm",
+          "codeName" : "MobPickupTreeViewnode3_cm",
           "controlType" : "CONTEXTMENU",
           "logicName" : "树上下文菜单",
-          "name" : "node1_cm",
+          "name" : "node3_cm",
           "getPSAppDataEntity" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
           },
           "getPSControlParam" : {
-            "id" : "node1_cm"
+            "id" : "node3_cm"
           },
           "getPSDEToolbarItems" : [ {
             "caption" : "二级",
@@ -189,7 +189,7 @@
                 "noPrivDisplayMode" : 2,
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "node1_cm_deuiaction5"
+                  "id" : "node3_cm_deuiaction5"
                 },
                 "getPSUIAction" : {
                   "actionTarget" : "NONE",
@@ -220,7 +220,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node1_cm_deuiaction3"
+                "id" : "node3_cm_deuiaction3"
               },
               "getPSSysImage" : {
                 "glyph" : "xf021@FontAwesome",
@@ -263,16 +263,16 @@
           "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
           "modeltype" : "PSDETOOLBAR"
         }, {
-          "codeName" : "MobPickupTreeViewnode3_cm",
+          "codeName" : "MobPickupTreeViewnode1_cm",
           "controlType" : "CONTEXTMENU",
           "logicName" : "树上下文菜单",
-          "name" : "node3_cm",
+          "name" : "node1_cm",
           "getPSAppDataEntity" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
           },
           "getPSControlParam" : {
-            "id" : "node3_cm"
+            "id" : "node1_cm"
           },
           "getPSDEToolbarItems" : [ {
             "caption" : "二级",
@@ -290,7 +290,7 @@
                 "noPrivDisplayMode" : 2,
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "node3_cm_deuiaction5"
+                  "id" : "node1_cm_deuiaction5"
                 },
                 "getPSUIAction" : {
                   "actionTarget" : "NONE",
@@ -321,7 +321,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node3_cm_deuiaction3"
+                "id" : "node1_cm_deuiaction3"
               },
               "getPSSysImage" : {
                 "glyph" : "xf021@FontAwesome",
@@ -641,11 +641,19 @@
           "selected" : false,
           "id" : "node1"
         }, {
+          "getChildCntPSAppDEField" : {
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
+          },
           "counterMode" : 0,
           "getIdPSAppDEField" : {
             "name" : "TESTID",
             "codeName" : "TESTId"
           },
+          "getLeafFlagPSAppDEField" : {
+            "name" : "NUMBER1",
+            "codeName" : "Number1"
+          },
           "maxSize" : -1,
           "name" : "动态集合",
           "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1481,16 +1481,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/TestTreeView_TreeView.json

@@ -50,16 +50,16 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
   },
   "getPSControls" : [ {
-    "codeName" : "ControlDefaultLoadTestnode1_cm",
+    "codeName" : "ControlDefaultLoadTestnode3_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树上下文菜单",
-    "name" : "node1_cm",
+    "name" : "node3_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     },
     "getPSControlParam" : {
-      "id" : "node1_cm"
+      "id" : "node3_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -76,11 +76,11 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node1_cm_deuiaction1"
+        "id" : "node3_cm_deuiaction1"
       },
       "getPSControlLogics" : [ {
         "itemName" : "deuiaction1",
-        "logicTag" : "node1_cm",
+        "logicTag" : "node3_cm",
         "logicType" : "SCRIPT",
         "name" : "logic11",
         "scriptCode" : "true",
@@ -154,11 +154,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node1_cm_deuiaction2"
+          "id" : "node3_cm_deuiaction2"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction2",
-          "logicTag" : "node1_cm",
+          "logicTag" : "node3_cm",
           "logicType" : "SCRIPT",
           "name" : "logic222",
           "scriptCode" : "false",
@@ -232,7 +232,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction4"
+            "id" : "node3_cm_deuiaction4"
           },
           "getPSSysImage" : {
             "glyph" : "xf00d@FontAwesome",
@@ -287,7 +287,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction5"
+            "id" : "node3_cm_deuiaction5"
           },
           "getPSUIAction" : {
             "actionTarget" : "NONE",
@@ -318,7 +318,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node1_cm_deuiaction3"
+          "id" : "node3_cm_deuiaction3"
         },
         "getPSSysImage" : {
           "glyph" : "xf021@FontAwesome",
@@ -361,16 +361,16 @@
     "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "ControlDefaultLoadTestnode3_cm",
+    "codeName" : "ControlDefaultLoadTestnode1_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树上下文菜单",
-    "name" : "node3_cm",
+    "name" : "node1_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     },
     "getPSControlParam" : {
-      "id" : "node3_cm"
+      "id" : "node1_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -387,11 +387,11 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node3_cm_deuiaction1"
+        "id" : "node1_cm_deuiaction1"
       },
       "getPSControlLogics" : [ {
         "itemName" : "deuiaction1",
-        "logicTag" : "node3_cm",
+        "logicTag" : "node1_cm",
         "logicType" : "SCRIPT",
         "name" : "logic11",
         "scriptCode" : "true",
@@ -465,11 +465,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node3_cm_deuiaction2"
+          "id" : "node1_cm_deuiaction2"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction2",
-          "logicTag" : "node3_cm",
+          "logicTag" : "node1_cm",
           "logicType" : "SCRIPT",
           "name" : "logic222",
           "scriptCode" : "false",
@@ -543,7 +543,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction4"
+            "id" : "node1_cm_deuiaction4"
           },
           "getPSSysImage" : {
             "glyph" : "xf00d@FontAwesome",
@@ -598,7 +598,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction5"
+            "id" : "node1_cm_deuiaction5"
           },
           "getPSUIAction" : {
             "actionTarget" : "NONE",
@@ -629,7 +629,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node3_cm_deuiaction3"
+          "id" : "node1_cm_deuiaction3"
         },
         "getPSSysImage" : {
           "glyph" : "xf021@FontAwesome",
@@ -1159,11 +1159,19 @@
     "selected" : false,
     "id" : "node1"
   }, {
+    "getChildCntPSAppDEField" : {
+      "name" : "AMOUNT",
+      "codeName" : "Amount"
+    },
     "counterMode" : 0,
     "getIdPSAppDEField" : {
       "name" : "TESTID",
       "codeName" : "TESTId"
     },
+    "getLeafFlagPSAppDEField" : {
+      "name" : "NUMBER1",
+      "codeName" : "Number1"
+    },
     "maxSize" : -1,
     "name" : "动态集合",
     "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTControlDefaultLoadTest.json

@@ -1423,16 +1423,16 @@
         "id" : "TREEVIEW"
       },
       "getPSControls" : [ {
-        "codeName" : "ControlDefaultLoadTestnode1_cm",
+        "codeName" : "ControlDefaultLoadTestnode3_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "树上下文菜单",
-        "name" : "node1_cm",
+        "name" : "node3_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
         },
         "getPSControlParam" : {
-          "id" : "node1_cm"
+          "id" : "node3_cm"
         },
         "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
@@ -1449,11 +1449,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction1"
+            "id" : "node3_cm_deuiaction1"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction1",
-            "logicTag" : "node1_cm",
+            "logicTag" : "node3_cm",
             "logicType" : "SCRIPT",
             "name" : "logic11",
             "scriptCode" : "true",
@@ -1527,11 +1527,11 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction2"
+              "id" : "node3_cm_deuiaction2"
             },
             "getPSControlLogics" : [ {
               "itemName" : "deuiaction2",
-              "logicTag" : "node1_cm",
+              "logicTag" : "node3_cm",
               "logicType" : "SCRIPT",
               "name" : "logic222",
               "scriptCode" : "false",
@@ -1605,7 +1605,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node1_cm_deuiaction4"
+                "id" : "node3_cm_deuiaction4"
               },
               "getPSSysImage" : {
                 "glyph" : "xf00d@FontAwesome",
@@ -1660,7 +1660,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node1_cm_deuiaction5"
+                "id" : "node3_cm_deuiaction5"
               },
               "getPSUIAction" : {
                 "actionTarget" : "NONE",
@@ -1691,7 +1691,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction3"
+              "id" : "node3_cm_deuiaction3"
             },
             "getPSSysImage" : {
               "glyph" : "xf021@FontAwesome",
@@ -1734,16 +1734,16 @@
         "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "ControlDefaultLoadTestnode3_cm",
+        "codeName" : "ControlDefaultLoadTestnode1_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "树上下文菜单",
-        "name" : "node3_cm",
+        "name" : "node1_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
         },
         "getPSControlParam" : {
-          "id" : "node3_cm"
+          "id" : "node1_cm"
         },
         "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
@@ -1760,11 +1760,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction1"
+            "id" : "node1_cm_deuiaction1"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction1",
-            "logicTag" : "node3_cm",
+            "logicTag" : "node1_cm",
             "logicType" : "SCRIPT",
             "name" : "logic11",
             "scriptCode" : "true",
@@ -1838,11 +1838,11 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction2"
+              "id" : "node1_cm_deuiaction2"
             },
             "getPSControlLogics" : [ {
               "itemName" : "deuiaction2",
-              "logicTag" : "node3_cm",
+              "logicTag" : "node1_cm",
               "logicType" : "SCRIPT",
               "name" : "logic222",
               "scriptCode" : "false",
@@ -1916,7 +1916,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node3_cm_deuiaction4"
+                "id" : "node1_cm_deuiaction4"
               },
               "getPSSysImage" : {
                 "glyph" : "xf00d@FontAwesome",
@@ -1971,7 +1971,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node3_cm_deuiaction5"
+                "id" : "node1_cm_deuiaction5"
               },
               "getPSUIAction" : {
                 "actionTarget" : "NONE",
@@ -2002,7 +2002,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction3"
+              "id" : "node1_cm_deuiaction3"
             },
             "getPSSysImage" : {
               "glyph" : "xf021@FontAwesome",
@@ -2532,11 +2532,19 @@
         "selected" : false,
         "id" : "node1"
       }, {
+        "getChildCntPSAppDEField" : {
+          "name" : "AMOUNT",
+          "codeName" : "Amount"
+        },
         "counterMode" : 0,
         "getIdPSAppDEField" : {
           "name" : "TESTID",
           "codeName" : "TESTId"
         },
+        "getLeafFlagPSAppDEField" : {
+          "name" : "NUMBER1",
+          "codeName" : "Number1"
+        },
         "maxSize" : -1,
         "name" : "动态集合",
         "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestTreeView.json

@@ -140,16 +140,16 @@
       "id" : "TREE"
     },
     "getPSControls" : [ {
-      "codeName" : "TestTreeViewnode1_cm",
+      "codeName" : "TestTreeViewnode3_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node1_cm",
+      "name" : "node3_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node1_cm"
+        "id" : "node3_cm"
       },
       "getPSDEToolbarItems" : [ {
         "getCapPSLanguageRes" : {
@@ -166,11 +166,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node1_cm_deuiaction1"
+          "id" : "node3_cm_deuiaction1"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction1",
-          "logicTag" : "node1_cm",
+          "logicTag" : "node3_cm",
           "logicType" : "SCRIPT",
           "name" : "logic11",
           "scriptCode" : "true",
@@ -244,11 +244,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction2"
+            "id" : "node3_cm_deuiaction2"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction2",
-            "logicTag" : "node1_cm",
+            "logicTag" : "node3_cm",
             "logicType" : "SCRIPT",
             "name" : "logic222",
             "scriptCode" : "false",
@@ -322,7 +322,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction4"
+              "id" : "node3_cm_deuiaction4"
             },
             "getPSSysImage" : {
               "glyph" : "xf00d@FontAwesome",
@@ -377,7 +377,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node1_cm_deuiaction5"
+              "id" : "node3_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -408,7 +408,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node1_cm_deuiaction3"
+            "id" : "node3_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -451,16 +451,16 @@
       "modelid" : "EE623BDE-0681-469C-BCA1-EA55F25E3732",
       "modeltype" : "PSDETOOLBAR"
     }, {
-      "codeName" : "TestTreeViewnode3_cm",
+      "codeName" : "TestTreeViewnode1_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树上下文菜单",
-      "name" : "node3_cm",
+      "name" : "node1_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
       },
       "getPSControlParam" : {
-        "id" : "node3_cm"
+        "id" : "node1_cm"
       },
       "getPSDEToolbarItems" : [ {
         "getCapPSLanguageRes" : {
@@ -477,11 +477,11 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node3_cm_deuiaction1"
+          "id" : "node1_cm_deuiaction1"
         },
         "getPSControlLogics" : [ {
           "itemName" : "deuiaction1",
-          "logicTag" : "node3_cm",
+          "logicTag" : "node1_cm",
           "logicType" : "SCRIPT",
           "name" : "logic11",
           "scriptCode" : "true",
@@ -555,11 +555,11 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction2"
+            "id" : "node1_cm_deuiaction2"
           },
           "getPSControlLogics" : [ {
             "itemName" : "deuiaction2",
-            "logicTag" : "node3_cm",
+            "logicTag" : "node1_cm",
             "logicType" : "SCRIPT",
             "name" : "logic222",
             "scriptCode" : "false",
@@ -633,7 +633,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction4"
+              "id" : "node1_cm_deuiaction4"
             },
             "getPSSysImage" : {
               "glyph" : "xf00d@FontAwesome",
@@ -688,7 +688,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node3_cm_deuiaction5"
+              "id" : "node1_cm_deuiaction5"
             },
             "getPSUIAction" : {
               "actionTarget" : "NONE",
@@ -719,7 +719,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node3_cm_deuiaction3"
+            "id" : "node1_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -1249,11 +1249,19 @@
       "selected" : false,
       "id" : "node1"
     }, {
+      "getChildCntPSAppDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      },
       "counterMode" : 0,
       "getIdPSAppDEField" : {
         "name" : "TESTID",
         "codeName" : "TESTId"
       },
+      "getLeafFlagPSAppDEField" : {
+        "name" : "NUMBER1",
+        "codeName" : "Number1"
+      },
       "maxSize" : -1,
       "name" : "动态集合",
       "nodeType" : "node3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -11221,16 +11221,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {
@@ -11259,10 +11259,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -11271,10 +11271,10 @@
         "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     } ]
   }, {
@@ -11291,16 +11291,16 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
       "name" : "消息位置-视图上方",
@@ -11309,44 +11309,45 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       },
       "position" : "POPUP"
     }, {
@@ -11357,29 +11358,22 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
       "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -11391,6 +11385,12 @@
         "modelref" : true,
         "id" : "ViewMsg12"
       }
+    }, {
+      "name" : "关闭模式-本次删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
     } ]
   }, {
     "codeName" : "VMGroup6",

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: