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

app_Web/packages/ibiz-core/src/engine/view-engine.ts

@@ -157,7 +157,7 @@ export class ViewEngine {
                     return;
                 }
                 const _item = models[key];
-                if (_item.uiaction && (Object.is(_item.uiaction.actionTarget, 'SINGLEKEY') || Object.is(_item.uiaction.actionTarget, 'MULTIKEY'))) {
+                if (_item.uiaction && (Object.is(_item.uiaction.actionTarget, 'SINGLEKEY') || Object.is(_item.uiaction.actionTarget, 'MULTIKEY') || Object.is(_item.uiaction.actionTarget, 'SINGLEDATA'))) {
                     _item.disabled = state;
                 }
                 _item.visabled = true;

app_Web/packages/ibiz-core/src/model/form-detail/form-item.ts

@@ -53,6 +53,13 @@ export class FormItemModel extends FormDetailModel {
      */
     public ignoreInput?: number | null;
 
+    /**
+     * @description 动态值项名称
+     * @type {string}
+     * @memberof FormItemModel
+     */
+    public captionItemName: string = '';
+
     /**
      * Creates an instance of FormItemModel.
      * FormItemModel 实例
@@ -66,6 +73,7 @@ export class FormItemModel extends FormDetailModel {
         this.enableCond = opts.enableCond;
         this.required = opts.required;
         this.ignoreInput = opts.ignoreInput;
+        this.captionItemName = opts.captionItemName;
     }
 
     /**

app_Web/packages/ibiz-vue/src/app-logic/app-front-action.ts

@@ -116,6 +116,7 @@ export class AppFrontAction extends AppDEUIAction {
                 data = UIActionTool.handleActionParam(actionTarget, _args, context, params, tempViewParam);
             }
             Object.assign(context, tempContext);
+            Object.assign(params, data);
             // 构建srfparentdename和srfparentkey
             let parentObj: any = {
                 srfparentdename: srfParentDeName ? srfParentDeName : null,
@@ -124,15 +125,15 @@ export class AppFrontAction extends AppDEUIAction {
             Object.assign(context, parentObj);
             // 打印
             if (Object.is(this.actionModel.frontProcessType, 'PRINT')) {
-                await this.executePrint(actionContext, context, data);
+                await this.executePrint(actionContext, context, params);
             }
             // 数据导入            
             else if (Object.is(this.actionModel.frontProcessType, 'DATAIMP')) {
-                await this.executeDataImport(actionContext, context, data);
+                await this.executeDataImport(actionContext, context, params);
             }
             // 数据导出
             else if (Object.is(this.actionModel.frontProcessType, 'DATAEXP')) {
-                await this.executeDataExport(actionContext, context, data);
+                await this.executeDataExport(actionContext, context, params);
             } else {
                 const frontPSAppView: IPSAppView | null = this.actionModel.getFrontPSAppView();
                 return this.oPenView(
@@ -143,7 +144,6 @@ export class AppFrontAction extends AppDEUIAction {
                     deUIService,
                     params,
                     $event,
-                    data,
                     xData,
                     _args,
                 );
@@ -160,7 +160,6 @@ export class AppFrontAction extends AppDEUIAction {
      * @param {*} deUIService
      * @param {*} params
      * @param {*} $event
-     * @param {*} data
      * @param {*} xData
      * @param {*} _args
      * @return {*}
@@ -174,7 +173,6 @@ export class AppFrontAction extends AppDEUIAction {
         deUIService: any,
         params: any,
         $event: any,
-        data: any,
         xData: any,
         _args: any,
     ): Promise<any> {
@@ -227,9 +225,9 @@ export class AppFrontAction extends AppDEUIAction {
                 }
             };
             if (Object.is(this.actionModel.frontProcessType, 'OPENHTMLPAGE') && this.actionModel.htmlPageUrl) {
-                const url = StringUtil.fillStrData(this.actionModel.htmlPageUrl, context, data);
+                const url = StringUtil.fillStrData(this.actionModel.htmlPageUrl, context, params);
                 window.open(url, '_blank');
-                resolve(new UIActionResult({ ok: true, result: data }));
+                resolve(new UIActionResult({ ok: true, result: _args }));
                 // 打开顶级视图，打开顶级视图或向导（模态）
             } else if (
                 Object.is(this.actionModel.frontProcessType, 'TOP') ||
@@ -302,7 +300,7 @@ export class AppFrontAction extends AppDEUIAction {
                     await ViewTool.calcRedirectContext(context, args[0], redirectAppEntity);
                     redirectUIService.getRDAppView(
                         context,
-                        data,
+                        params,
                         args[0],
                         { action: frontPSAppView.getGetDataPSAppDEAction()?.codeName, type: frontPSAppView.getTypePSAppDEField()?.codeName }
                     ).then(async (result: any) => {
@@ -325,7 +323,7 @@ export class AppFrontAction extends AppDEUIAction {
                                 [{ key: targetOpenView?.getPSAppDataEntity()?.codeName, rawValue: false, value: ModelTool.getContainerAppEntityCodeName(frontPSAppView) }],
                                 true,
                             );
-                            const _context: any = Util.computedNavData(args[0], context, data, indexContext);
+                            const _context: any = Util.computedNavData(args[0], context, params, indexContext);
                             Object.assign(context, _context);
                         }
                         if (
@@ -336,10 +334,10 @@ export class AppFrontAction extends AppDEUIAction {
                                 targetOpenViewRef.getPSNavigateContexts(),
                                 true,
                             );
-                            let _context: any = Util.computedNavData(args[0], context, data, localContextRef);
+                            let _context: any = Util.computedNavData(args[0], context, params, localContextRef);
                             Object.assign(context, _context);
                         }
-                        ViewTool.clearParentParams(context,params);
+                        ViewTool.clearParentParams(context, params);
                         return this.oPenView(
                             targetOpenView,
                             actionContext,
@@ -348,9 +346,8 @@ export class AppFrontAction extends AppDEUIAction {
                             deUIService,
                             params,
                             $event,
-                            data,
                             xData,
-                            _args,
+                            _args
                         );
 
                     })
@@ -361,10 +358,10 @@ export class AppFrontAction extends AppDEUIAction {
                         deResParameters,
                         parameters,
                         _args,
-                        data,
+                        params,
                     );
                     actionContext.$router.push(routePath);
-                    resolve(openViewNextLogic(this.actionModel, actionContext, xData, data));
+                    resolve(openViewNextLogic(this.actionModel, actionContext, xData, args));
                 } else if (frontPSAppView.openMode == 'POPUPMODAL') {
                     const view: any = {
                         viewname: 'app-view-shell',
@@ -372,7 +369,7 @@ export class AppFrontAction extends AppDEUIAction {
                         width: frontPSAppView.width,
                         title: actionContext.$tl(frontPSAppView.getTitlePSLanguageRes()?.lanResTag, frontPSAppView.title),
                     };
-                    let container: Subject<any> = actionContext.$appmodal.openModal(view, context, data, args);
+                    let container: Subject<any> = actionContext.$appmodal.openModal(view, context, params, args);
                     container.subscribe((result: any) => {
                         if (!result || !Object.is(result.ret, 'OK')) {
                             return;
@@ -389,7 +386,7 @@ export class AppFrontAction extends AppDEUIAction {
                     };
                     let container: Subject<any> = actionContext.$appdrawer.openDrawer(
                         view,
-                        Util.getViewProps(context, data, args),
+                        Util.getViewProps(context, params, args),
                     );
                     container.subscribe((result: any) => {
                         if (!result || !Object.is(result.ret, 'OK')) {
@@ -407,7 +404,7 @@ export class AppFrontAction extends AppDEUIAction {
                     };
                     const container = appPopup.openDrawer(
                         view,
-                        Util.getViewProps(context, data, args),
+                        Util.getViewProps(context, params, args),
                     );
                     container.subscribe((result: any) => {
                         if (!result || !Object.is(result.ret, 'OK')) {
@@ -423,7 +420,7 @@ export class AppFrontAction extends AppDEUIAction {
                         title: actionContext.$tl(frontPSAppView.getTitlePSLanguageRes()?.lanResTag, frontPSAppView.title),
                         placement: frontPSAppView.openMode,
                     };
-                    let container: Subject<any> = actionContext.$apppopover.openPop($event, view, context, data, 'left-end', true, args);
+                    let container: Subject<any> = actionContext.$apppopover.openPop($event, view, context, params, 'left-end', true, args);
                     container.subscribe((result: any) => {
                         if (!result || !Object.is(result.ret, 'OK')) {
                             return;
@@ -439,7 +436,7 @@ export class AppFrontAction extends AppDEUIAction {
                 // 用户自定义
             } else {
                 LogUtil.warn(`${this.actionModel.caption}自定义界面行为空执行`);
-                resolve(openViewNextLogic(this.actionModel, actionContext, xData, data));
+                resolve(openViewNextLogic(this.actionModel, actionContext, xData, args));
             }
         })
     }

app_Web/packages/ibiz-vue/src/components/common/app-grid-column/app-grid-column.tsx

@@ -112,7 +112,7 @@ export class AppDefaultGridColumn extends Vue {
                 viewname: 'app-view-shell',
                 height: linkView.height,
                 width: linkView.width,
-                title: this.$tl(linkView.getCapPSLanguageRes()?.lanResTag, linkView.title),
+                title: this.$tl(linkView.getTitlePSLanguageRes()?.lanResTag, linkView.title),
                 isRedirectView: linkView.redirectView ? true : false,
                 placement: linkView.openMode ? linkView.openMode : '',
                 viewpath: linkView.modelFilePath

app_Web/packages/ibiz-vue/src/components/components-register.ts

@@ -283,7 +283,7 @@ import { AppDefaultReportPanel } from './control/app-default-reportpanel/app-def
 import { AppDefaultMapExpBar } from './control/app-default-map-exp-bar/app-default-map-exp-bar';
 import { AppDefaultViewPanel } from './control/app-default-viewpanel/app-default-viewpanel';
 import { NotificationSignal } from '../directives';
-import { Badge } from '../directives';
+import { Badge, TabOffset } from '../directives';
 export const ComponentsRegister = {
     install(v: any, opt: any) {
         v.component('app-picker-importability', AppPickerImportability);
@@ -572,5 +572,6 @@ export const ComponentsRegister = {
         // 注册指令
         v.directive('notification-signal', NotificationSignal);
         v.directive('badge', Badge);
+        v.directive('tab-offset', TabOffset);
     }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/components/control/app-default-form/app-default-form-item/app-default-form-item.tsx

@@ -223,11 +223,10 @@ export class AppDefaultFormItem extends AppDefaultFormDetail {
         contentStyle += contentWidth && contentWidth != 0 ? `width:${contentWidth}px;` : '';
         contentStyle += contentHeight && contentHeight != 0 ? `height:${contentHeight}px;` : '';
         contentStyle += this.runtimeModel?.visible ? '' : 'display: none;';
-        let labelCaption: any = this.detailsInstance.captionItemName ? this.data[this.detailsInstance.captionItemName.toLowerCase()] : this.$tl((this.detailsInstance.getCapPSLanguageRes() as IPSLanguageRes)?.lanResTag, caption);
         return (
             <app-form-item
                 name={name}
-                caption={labelCaption}
+                caption={this.runtimeModel.caption}
                 isEmptyCaption={emptyCaption}
                 isShowCaption={showCaption}
                 labelWidth={labelWidth}

app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-editview-layout/app-default-editview-layout.less

 //关系界面嵌入树导航视图
 .view-default.deeditview.view-container {
-    >.ivu-card >.ivu-card-body {
+    >.ivu-card {
+      >.ivu-card-head {
+        >.header-container {
+          .caption-info {
+            max-width: 40%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+        }
+      }
+      >.ivu-card-body {
         position: relative;
         .app-form .ivu-tabs >.ivu-tabs-content {
             padding: 0;
@@ -20,4 +31,5 @@
             height: calc(100% - 8px);
         }
       }
+    }
 }

app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-tabexpview-layout/app-default-tabexpview-layout.less

@@ -20,7 +20,6 @@
         min-height: 0px;
         height: 0px;
         >.caption {
-          max-width: 120px;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
@@ -33,10 +32,12 @@
         padding: 0;
       }
       >.content-container >.tabexppanel >.ivu-tabs {
-        .ivu-tabs-bar .ivu-tabs-nav-container {
+        .ivu-tabs-bar {
             padding-left: 120px;
+            .ivu-tabs-nav-container {
               height: 48px;
             }
+        }
         .ivu-tabs-bar .ivu-tabs-nav-container .ivu-tabs-nav-wrap .ivu-tabs-nav-scroll .ivu-tabs-nav {
           height: 48px;
           line-height: 32px;

app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-tabexpview-layout/app-default-tabexpview-layout.tsx

@@ -37,10 +37,15 @@ export class AppDefaultTabExpViewLayout extends AppDefaultViewLayout {
      * @memberof AppDefaultTabExpViewLayout
      */
     public renderViewHeader() {
+        const offset ={
+            root: this.$parent,
+            gap: 8,
+            targetClass: 'ivu-tabs-bar',
+        }
         return (
             <div slot="title" class='header-container' key='view-header'>
                 {this.showCaption ? 
-                    <div class="caption">
+                    <div class="caption" v-tab-offset={offset}>
                         <span class='info'>{this.$slots.captionInfo ? this.$slots.captionInfo : this.viewInstance.caption}</span>
                     </div> : null }
             </div>

app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-treeexpview-layout/app-default-treeexpview-layout.less

+.view-default.detreeexpview.view-container {
+    .exp-view_nav-view >.viewcontainer2{
+        margin-top: 0;
+    }
+}
\ No newline at end of file

app_Web/packages/ibiz-vue/src/control-container/control-container.tsx

@@ -1039,7 +1039,7 @@ export class ControlContainer extends Vue {
                             viewname: 'app-view-shell',
                             height: targetOpenView.height,
                             width: targetOpenView.width,
-                            title: this.$tl(targetOpenView.getCapPSLanguageRes()?.lanResTag, targetOpenView.caption),
+                            title: this.$tl(targetOpenView.getTitlePSLanguageRes()?.lanResTag, targetOpenView.title),
                         };
                         if (!targetOpenView.openMode || targetOpenView.openMode == 'INDEXVIEWTAB' || targetOpenView.openMode == 'POPUPAPP') {
                             if (targetOpenView.getPSAppDataEntity()) {
@@ -1150,7 +1150,7 @@ export class ControlContainer extends Vue {
                         viewname: 'app-view-shell',
                         height: wizardPSAppView.height,
                         width: wizardPSAppView.width,
-                        title: this.$tl(wizardPSAppView.getCapPSLanguageRes()?.lanResTag, wizardPSAppView.caption),
+                        title: this.$tl(wizardPSAppView.getTitlePSLanguageRes()?.lanResTag, wizardPSAppView.title),
                     };
                     const tempContext: any = JSON.parse(JSON.stringify(this.context));
                     if (wizardPSAppView && wizardPSAppView.modelPath) {
@@ -1184,7 +1184,7 @@ export class ControlContainer extends Vue {
                                     viewname: 'app-view-shell',
                                     height: targetNewDataAppView.height,
                                     width: targetNewDataAppView.width,
-                                    title: this.$tl(targetNewDataAppView.getCapPSLanguageRes()?.lanResTag, targetNewDataAppView.caption),
+                                    title: this.$tl(targetNewDataAppView.getTitlePSLanguageRes()?.lanResTag, targetNewDataAppView.title),
                                 };
                                 if (targetNewDataAppView && targetNewDataAppView.modelPath) {
                                     Object.assign(tempContext, { viewpath: targetNewDataAppView.modelPath });

app_Web/packages/ibiz-vue/src/directives/index.ts

 export { NotificationSignal, nsc } from './notification-signal/notification-signal'
 export { Badge } from './badge/badge'
+export { TabOffset } from './tab-offset/tab-offset'
\ No newline at end of file

app_Web/packages/ibiz-vue/src/directives/tab-offset/tab-offset.tsx

+import { VNode } from 'vue';
+
+/**
+ * 分页偏移指令
+ *
+ * @export
+ * @class TabOffset
+ */
+export const TabOffset: any = {
+
+    /**
+     * 指令更新
+     *
+     * @param {HTMLDivElement} el
+     * @param {*} binding
+     * @param {VNode} vNode
+     * @param {VNode} oldVNode
+     */
+    componentUpdated(el: HTMLDivElement, binding: any, vNode: VNode, oldVNode: VNode) {
+        bc.update(el, binding);
+    },
+};
+
+/**
+ * 分页偏移控制器
+ *
+ * @export
+ * @class TabOffsetController
+ */
+export class TabOffsetController {
+    /**
+     * 唯一实例
+     *
+     * @private
+     * @static
+     * @memberof TabOffsetControllerController
+     */
+    private static readonly instance = new TabOffsetController();
+
+    /**
+     * @description 偏移
+     * @protected
+     * @type {number}
+     * @memberof TabOffsetController
+     */
+    protected offset: number = 0;
+
+    /**
+     * @description 间隔
+     * @protected
+     * @type {number}
+     * @memberof TabOffsetController
+     */
+    protected gap: number = 0;
+
+    /**
+     * 创建实列
+     * @memberof TabOffsetControllerController
+     */
+    private constructor() {
+        if (TabOffsetController.instance) {
+            return TabOffsetController.instance;
+        }
+    }
+
+    /**
+     * 更新
+     *
+     * @param {HTMLDivElement}
+     * @param {any}
+     * @memberof TabOffsetController
+     */
+    public update(el: HTMLDivElement, binding: any): void {
+        this.offset = el.offsetWidth;
+        const data = binding.value;
+        this.gap = data.gap;
+        if (data && data.root && data.root.$el) {
+            const source = data.root.$el.querySelector(`.${data.targetClass}`);
+            if (source) {
+                source.style.paddingLeft = `${this.offset + this.gap}px`;
+            }
+        }
+    }
+
+    /**
+     * 获取唯一实例
+     *
+     * @static
+     * @returns {TabOffsetController}
+     * @memberof TabOffsetController
+     */
+    public static getInstance(): TabOffsetController {
+        return TabOffsetController.instance;
+    }
+}
+
+// 导出服务
+export const bc: TabOffsetController = TabOffsetController.getInstance();

app_Web/packages/ibiz-vue/src/utils/app-drawer/app-drawer.vue

@@ -239,7 +239,7 @@ export default class AppDrawerCompponent extends Vue {
         const component: any = this.$refs[this.viewname];
         if (component) {
             const viewInstance = component.$children[0];
-            const viewDataChange = this.$store.getters["viewAction/getViewDataChangeState"](viewInstance?.viewtag);
+            const viewDataChange = this.$store.getters["viewAction/getStateByViewTag"](viewInstance?.viewtag);
             if (viewDataChange) {
                 this.isShow = true;
                 const title: any = this.$t('app.tabpage.sureclosetip.title');
@@ -248,7 +248,7 @@ export default class AppDrawerCompponent extends Vue {
                     title: title,
                     content: contant,
                     onOk: () => {
-                        this.$store.commit('viewAction/removeView', viewInstance.viewtag);
+                        this.$store.commit('viewAction/removeViewByViewTag', viewInstance.viewtag);
                         this.isShow = false;
                     },
                     onCancel: () => {

app_Web/packages/ibiz-vue/src/utils/app-modal/app-modal.vue

@@ -266,7 +266,7 @@ export default class AppModalCompponent extends Vue {
         const component: any = this.$refs[this.viewname];
         if (component) {
             const viewInstance = component.$children[0];
-            const viewDataChange = this.$store.getters["viewAction/getViewDataChangeState"](viewInstance?.viewtag);
+            const viewDataChange = this.$store.getters["viewAction/getStateByViewTag"](viewInstance?.viewtag);
             if (viewDataChange) {
                 this.isShow = true;
                 const title: any = this.$t('app.tabpage.sureclosetip.title');
@@ -275,7 +275,7 @@ export default class AppModalCompponent extends Vue {
                     title: title,
                     content: contant,
                     onOk: () => {
-                        this.$store.commit('viewAction/removeView', viewInstance.viewtag);
+                        this.$store.commit('viewAction/removeViewByViewTag', viewInstance.viewtag);
                         this.isShow = false;
                     },
                     onCancel: () => {

app_Web/packages/ibiz-vue/src/view/view-base.tsx

@@ -581,6 +581,7 @@ export class ViewBase extends ControlContainer implements ViewInterface {
                 navHistory.setViewTag(this.viewtag, this.$route);
                 navHistory.setCaption({ tag: this.viewtag, caption: this.model.srfCaption, info: '' });
             }
+            this.$store.commit('viewAction/initAppViews', { viewTag: this.viewtag, path: this.$route.fullPath });
         }
         if (this.navDataService) {
             this.serviceStateEvent = this.navDataService.serviceState.subscribe(({ action, name, data }: { action: string, name: any, data: any }) => {
@@ -681,6 +682,8 @@ export class ViewBase extends ControlContainer implements ViewInterface {
         }
         // 视图销毁从导航栈里面删除数据
         this.navDataService.removeNavData(this.viewInstance.codeName);
+        // 销毁当前视图数据变更状态
+        this.$store.commit('viewAction/removeViewByViewTag', this.viewtag);
         // 销毁容器
         this.destroyUIContainer();
         // 取消订阅视图状态订阅对象

app_Web/packages/ibiz-vue/src/view/wfactionview-base.tsx

@@ -91,7 +91,7 @@ export class WFActionViewBase extends MainViewBase implements WFActionViewInterf
             if (!response || response.status !== 200) {
                 return;
             }
-            this.$store.commit('viewAction/setViewDataChange', { viewTag: this.viewtag, viewDataChange: false });
+            // this.$store.commit('viewAction/setViewDataChange', { viewTag: this.viewtag, viewDataChange: false });
             this.$emit('view-event', { viewName: this.viewInstance.name, action: 'viewdataschange', data: [{ ...response.data }] });
             this.$emit('view-event', { viewName: this.viewInstance.name, action: 'close', data: null });
         })

app_Web/packages/ibiz-vue/src/widgets/editform-control-base.tsx

@@ -1676,7 +1676,8 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                             disabled: false,
                             required: !(detail as IPSDEFormItem).allowEmpty,
                             enableCond: (detail as IPSDEFormItem).enableCond,
-                            ignoreInput: (detail as IPSDEFormItem).ignoreInput
+                            ignoreInput: (detail as IPSDEFormItem).ignoreInput,
+                            captionItemName: (detail as IPSDEFormItem).captionItemName,
                         });
                         detailModel = new FormItemModel(detailOpts);
                         break;
@@ -1866,6 +1867,17 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                     }
                 }
             })
+            // 动态标题值项
+            if (Object.is(detail.detailType, 'FORMITEM')) {
+                const captionItemName = (detail as IPSDEFormItem).captionItemName;
+                this.detailsModel[detail.name].caption = captionItemName ? this.data[captionItemName] : this.detailsModel[detail.name].caption;
+                // 值规则错误提示更新
+                if (this.rules[detail.name]) {
+                    this.rules[detail.name].forEach((rule: any) => {
+                        rule.message = `${this.$t('app.formpage.valueverif') as string}${this.data[captionItemName]}`;
+                    })
+                }
+            }
         })
 
         // 表单项更新

app_Web/packages/ibiz-vue/src/widgets/panel-control-base.tsx

@@ -454,7 +454,7 @@ export class PanelControlBase extends MDControlBase implements PanelControlInter
         if (result && result?.hasOwnProperty('srfret') && !result.srfret) {
             return;
         }
-        AppViewLogicService.getInstance().executeViewLogic(`${this.controlInstance.name.toLowerCase()}_${tag}_click`, event, this, data, this.controlInstance.getPSAppViewLogics());
+        AppViewLogicService.getInstance().executeViewLogic(`${this.controlInstance.name.toLowerCase()}_${tag}_click`, event, this, null, this.controlInstance.getPSAppViewLogics());
     }
 
     /**

app_Web/src/components/tab-page-exp/tab-page-exp.vue

@@ -172,9 +172,8 @@ export default class TabPageExp extends Vue {
      * @memberof TabPageExp
      */
     public onClose(name: any) {
-      const navHistory: any = AppServiceBase.getInstance().getAppNavDataService();
-      const item: any = navHistory.historyList[navHistory.findHistoryIndex(this.$route)];
-      const viewDataChange = this.$store.getters["viewAction/getViewDataChangeState"](item.tag);
+      const page = this.$store.getters.getPage(name);
+      const viewDataChange = this.$store.getters["viewAction/getStateByPath"](page.fullPath);
       if (viewDataChange) {
         const title: any = this.$t("app.tabpage.sureclosetip.title");
         const content: any = this.$t("app.tabpage.sureclosetip.content");
@@ -182,7 +181,7 @@ export default class TabPageExp extends Vue {
           title: title,
           content: content,
           onOk: () => {
-            this.$store.commit('viewAction/removeView', item.tag);
+            this.$store.commit('viewAction/removeViewByPath', page.fullPath);
             this.$store.commit("deletePage", name);
             this.gotoPage();
           },

app_Web/src/store/modules/view-action/getters.ts

 /**
- * 获取视图数据变化状态
+ * 根据viewTag获取指定视图的视图数据变化状态
  * 
  * @param state 
  */
-export const getViewDataChangeState = (state:any) => (viewTag: string) => {
+export const getStateByViewTag = (state: any) => (viewTag: string) => {
   const appView = state.appViews.find((appView: any) => Object.is(appView.viewTag, viewTag));
   if (appView) {
     return appView.viewDataChange;
@@ -11,3 +11,17 @@ export const getViewDataChangeState = (state:any) => (viewTag: string) => {
     return false;
   }
 }
+
+/**
+* 根据路由路径path获取指定视图的视图数据变化状态
+* 
+* @param state 
+*/
+export const getStateByPath = (state: any) => (path: string) => {
+  const appView = state.appViews.find((appView: any) => Object.is(appView.path, path));
+  if (appView) {
+    return appView.viewDataChange;
+  } else {
+    return false;
+  }
+}
\ No newline at end of file

app_Web/src/store/modules/view-action/mutations.ts

-
 /**
- * 删除视图
+ * 根据viewTag删除视图
  * 
  * @param state 
  * @param viewTag  视图viewTag
  */
-export const removeView = (state: any, viewTag: string) => {
+export const removeViewByViewTag = (state: any, viewTag: string) => {
     const index = state.appViews.findIndex((appView: any) => Object.is(appView.viewTag, viewTag));
     if (index !== -1) {
       state.appViews.splice(index, 1);
     }
 }
 
+/**
+ * 根据路由path删除视图
+ * 
+ * @param state 
+ * @param path  视图路由
+ */
+export const removeViewByPath = (state: any, path: string) => {
+  const index = state.appViews.findIndex((appView: any) => Object.is(appView.path, path));
+  if (index !== -1) {
+    state.appViews.splice(index, 1);
+  }
+}
+
 /**
  * 设置视图数据变化状态
  * 
@@ -26,3 +38,18 @@ export const setViewDataChange = (state: any, { viewTag, viewDataChange }: { vie
       state.appViews.push({ viewTag, viewDataChange })
     }
 }
+
+/**
+ * 初始化appViews集合
+ * 
+ * @param state 
+ * @param param { viewTag, path } (视图viewTag, 路由路径)
+ */
+export const initAppViews = (state: any, { viewTag, path }: { viewTag: string, path: string }) => {
+    const appView = state.appViews.find((appView: any) => Object.is(appView.viewTag, viewTag)); 
+    if (appView) {
+      appView.path = path;
+    } else {
+      state.appViews.push({ viewTag, path })
+    }
+}

app_Web/src/store/modules/view-action/state.ts

 /**
- * 视图状态
+ * 视图行为
  */
 export const viewAction: any = {
     // 应用视图

pom.xml

@@ -29,31 +29,31 @@
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-cloud</artifactId>
-            <version>8.1.0.172</version>
+            <version>8.1.0.181</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-redis</artifactId>
-            <version>8.1.0.172</version>
+            <version>8.1.0.181</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-mybatisplus-spring-boot-starter</artifactId>
-            <version>8.1.0.172</version>
+            <version>8.1.0.181</version>
         </dependency>
 
          <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-zookeeper</artifactId>
-            <version>8.1.0.172</version>
+            <version>8.1.0.181</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-poi</artifactId>
-            <version>8.1.0.172</version>
+            <version>8.1.0.181</version>
         </dependency>
 
     </dependencies>

trainsys-core/src/main/resources/liquibase/cn/ibizlab/trainsys/DEFAULT/h2_table.xml

@@ -17,12 +17,24 @@
             </column>
             <column name="FIELD" remarks="属性" type="VARCHAR(100)">
             </column>
+            <column name="FIELD10" remarks="日期" type="DATETIME">
+            </column>
             <column name="FIELD2" remarks="属性2" type="VARCHAR(100)">
             </column>
             <column name="FIELD3" remarks="属性3" type="VARCHAR(100)">
             </column>
             <column name="FIELD4" remarks="属性4" type="VARCHAR(100)">
             </column>
+            <column name="FIELD5" remarks="属性5" type="VARCHAR(100)">
+            </column>
+            <column name="FIELD6" remarks="属性6" type="VARCHAR(100)">
+            </column>
+            <column name="FIELD7" remarks="属性7" type="VARCHAR(100)">
+            </column>
+            <column name="FIELD8" remarks="属性8" type="VARCHAR(100)">
+            </column>
+            <column name="FIELD9" remarks="属性9" type="VARCHAR(100)">
+            </column>
             <column name="ORGID" remarks="组织机构标识" type="VARCHAR(60)">
             </column>
             <column name="TYPE" remarks="类型" type="VARCHAR(100)">

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-34-1">
+    <changeSet author="root" id="tab-book-49-1">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -31,6 +31,18 @@
                 </column>
                 <column name="FIELD4" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="FIELD5" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="FIELD6" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="FIELD7" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="FIELD8" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="FIELD9" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="FIELD10" remarks="" type="DATETIME">
+                </column>
         </createTable>
     </changeSet>
 

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -19,6 +19,9 @@
   }, {
     "expression" : "t1.`FIELD`",
     "name" : "FIELD"
+  }, {
+    "expression" : "t1.`FIELD10`",
+    "name" : "FIELD10"
   }, {
     "expression" : "t1.`FIELD2`",
     "name" : "FIELD2"
@@ -28,6 +31,21 @@
   }, {
     "expression" : "t1.`FIELD4`",
     "name" : "FIELD4"
+  }, {
+    "expression" : "t1.`FIELD5`",
+    "name" : "FIELD5"
+  }, {
+    "expression" : "t1.`FIELD6`",
+    "name" : "FIELD6"
+  }, {
+    "expression" : "t1.`FIELD7`",
+    "name" : "FIELD7"
+  }, {
+    "expression" : "t1.`FIELD8`",
+    "name" : "FIELD8"
+  }, {
+    "expression" : "t1.`FIELD9`",
+    "name" : "FIELD9"
   }, {
     "expression" : "t1.`ORGID`",
     "name" : "ORGID"
@@ -41,6 +59,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -19,6 +19,9 @@
   }, {
     "expression" : "t1.`FIELD`",
     "name" : "FIELD"
+  }, {
+    "expression" : "t1.`FIELD10`",
+    "name" : "FIELD10"
   }, {
     "expression" : "t1.`FIELD2`",
     "name" : "FIELD2"
@@ -28,6 +31,21 @@
   }, {
     "expression" : "t1.`FIELD4`",
     "name" : "FIELD4"
+  }, {
+    "expression" : "t1.`FIELD5`",
+    "name" : "FIELD5"
+  }, {
+    "expression" : "t1.`FIELD6`",
+    "name" : "FIELD6"
+  }, {
+    "expression" : "t1.`FIELD7`",
+    "name" : "FIELD7"
+  }, {
+    "expression" : "t1.`FIELD8`",
+    "name" : "FIELD8"
+  }, {
+    "expression" : "t1.`FIELD9`",
+    "name" : "FIELD9"
   }, {
     "expression" : "t1.`ORGID`",
     "name" : "ORGID"
@@ -41,6 +59,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -307,6 +307,42 @@
     "name" : "FIELD4",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "codeName" : "Field5",
+    "logicName" : "属性5",
+    "name" : "FIELD5",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Field6",
+    "logicName" : "属性6",
+    "name" : "FIELD6",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Field7",
+    "logicName" : "属性7",
+    "name" : "FIELD7",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Field8",
+    "logicName" : "属性8",
+    "name" : "FIELD8",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Field9",
+    "logicName" : "属性9",
+    "name" : "FIELD9",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Field10",
+    "logicName" : "日期",
+    "name" : "FIELD10",
+    "stdDataType" : 5,
+    "valueFormat" : "YYYY-MM-DD"
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BookDTO",
@@ -386,6 +422,18 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field10",
+      "logicName" : "日期",
+      "name" : "Field10",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD10",
+        "codeName" : "Field10"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 5,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "Field2",
       "logicName" : "属性2",
@@ -422,6 +470,66 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field5",
+      "logicName" : "属性5",
+      "name" : "Field5",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD5",
+        "codeName" : "Field5"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field6",
+      "logicName" : "属性6",
+      "name" : "Field6",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD6",
+        "codeName" : "Field6"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field7",
+      "logicName" : "属性7",
+      "name" : "Field7",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD7",
+        "codeName" : "Field7"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field8",
+      "logicName" : "属性8",
+      "name" : "Field8",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD8",
+        "codeName" : "Field8"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field9",
+      "logicName" : "属性9",
+      "name" : "Field9",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD9",
+        "codeName" : "Field9"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "OrgId",
       "logicName" : "组织机构标识",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main.json

@@ -120,6 +120,48 @@
       "name" : "FIELD4",
       "codeName" : "Field4"
     }
+  }, {
+    "id" : "field5",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD5",
+      "codeName" : "Field5"
+    }
+  }, {
+    "id" : "field6",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD6",
+      "codeName" : "Field6"
+    }
+  }, {
+    "id" : "field7",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD7",
+      "codeName" : "Field7"
+    }
+  }, {
+    "id" : "field8",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD8",
+      "codeName" : "Field8"
+    }
+  }, {
+    "id" : "field9",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD9",
+      "codeName" : "Field9"
+    }
+  }, {
+    "id" : "field10",
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "FIELD10",
+      "codeName" : "Field10"
+    }
   }, {
     "id" : "createman",
     "dataType" : 25,
@@ -421,6 +463,263 @@
       },
       "infoGroupMode" : false,
       "showCaption" : true
+    }, {
+      "actionGroupExtractMode" : "ITEM",
+      "caption" : "三列均分",
+      "codeName" : "grouppanel1",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "GROUPPANEL",
+      "name" : "grouppanel1",
+      "getPSDEFormDetails" : [ {
+        "actionGroupExtractMode" : "ITEM",
+        "caption" : "栅格嵌套flex",
+        "codeName" : "grouppanel2",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "GROUPPANEL",
+        "name" : "grouppanel2",
+        "getPSDEFormDetails" : [ {
+          "caption" : "属性5",
+          "codeName" : "field5",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field5",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD5",
+            "codeName" : "Field5"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "field5"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        }, {
+          "caption" : "属性6",
+          "codeName" : "field6",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field6",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD6",
+            "codeName" : "Field6"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "field6"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        } ],
+        "getPSLayout" : {
+          "align" : "flex-start",
+          "dir" : "row-reverse",
+          "layout" : "FLEX",
+          "vAlign" : "center"
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 8,
+          "colMD" : 8,
+          "colSM" : 8,
+          "colXS" : 8,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false,
+        "showCaption" : true
+      }, {
+        "actionGroupExtractMode" : "ITEM",
+        "caption" : "栅格嵌套栅格",
+        "codeName" : "grouppanel3",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "GROUPPANEL",
+        "name" : "grouppanel3",
+        "getPSDEFormDetails" : [ {
+          "caption" : "属性7",
+          "codeName" : "field7",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field7",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD7",
+            "codeName" : "Field7"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "field7"
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 8,
+            "colLGOffset" : 8,
+            "colMD" : 8,
+            "colMDOffset" : 8,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        }, {
+          "caption" : "属性8",
+          "codeName" : "field8",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field8",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD8",
+            "codeName" : "Field8"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "field8"
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 8,
+            "colLGOffset" : 4,
+            "colMD" : 8,
+            "colMDOffset" : 4,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        } ],
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 8,
+          "colMD" : 8,
+          "colSM" : 8,
+          "colXS" : 8,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false,
+        "showCaption" : true
+      }, {
+        "actionGroupExtractMode" : "ITEM",
+        "caption" : "栅格自动",
+        "codeName" : "grouppanel4",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "GROUPPANEL",
+        "name" : "grouppanel4",
+        "getPSDEFormDetails" : [ {
+          "caption" : "属性9",
+          "codeName" : "field9",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field9",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD9",
+            "codeName" : "Field9"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "field9"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        }, {
+          "caption" : "日期",
+          "codeName" : "field10",
+          "dataType" : 5,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "itemWidth" : 230.0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field10",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD10",
+            "codeName" : "Field10"
+          },
+          "getPSEditor" : {
+            "dateTimeFormat" : "YYYY-MM-DD",
+            "editorParams" : {
+              "TIMEFMT" : "YYYY-MM-DD"
+            },
+            "editorType" : "DATEPICKEREX_NOTIME",
+            "editorWidth" : 100.0,
+            "name" : "field10"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "valueFormat" : "YYYY-MM-DD",
+          "allowEmpty" : true,
+          "showCaption" : true
+        } ],
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 8,
+          "colMD" : 8,
+          "colSM" : 8,
+          "colXS" : 8,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false,
+        "showCaption" : true
+      } ],
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "infoGroupMode" : false,
+      "showCaption" : true
     } ],
     "getPSLayout" : {
       "columnCount" : 24,

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

@@ -1106,6 +1106,48 @@
         "name" : "FIELD4",
         "codeName" : "Field4"
       }
+    }, {
+      "id" : "field5",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD5",
+        "codeName" : "Field5"
+      }
+    }, {
+      "id" : "field6",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD6",
+        "codeName" : "Field6"
+      }
+    }, {
+      "id" : "field7",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD7",
+        "codeName" : "Field7"
+      }
+    }, {
+      "id" : "field8",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD8",
+        "codeName" : "Field8"
+      }
+    }, {
+      "id" : "field9",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD9",
+        "codeName" : "Field9"
+      }
+    }, {
+      "id" : "field10",
+      "dataType" : 5,
+      "getPSAppDEField" : {
+        "name" : "FIELD10",
+        "codeName" : "Field10"
+      }
     }, {
       "id" : "createman",
       "dataType" : 25,
@@ -1407,6 +1449,263 @@
         },
         "infoGroupMode" : false,
         "showCaption" : true
+      }, {
+        "actionGroupExtractMode" : "ITEM",
+        "caption" : "三列均分",
+        "codeName" : "grouppanel1",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "GROUPPANEL",
+        "name" : "grouppanel1",
+        "getPSDEFormDetails" : [ {
+          "actionGroupExtractMode" : "ITEM",
+          "caption" : "栅格嵌套flex",
+          "codeName" : "grouppanel2",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "GROUPPANEL",
+          "name" : "grouppanel2",
+          "getPSDEFormDetails" : [ {
+            "caption" : "属性5",
+            "codeName" : "field5",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "field5",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD5",
+              "codeName" : "Field5"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 100,
+              "name" : "field5"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "属性6",
+            "codeName" : "field6",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "field6",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD6",
+              "codeName" : "Field6"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 100,
+              "name" : "field6"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          } ],
+          "getPSLayout" : {
+            "align" : "flex-start",
+            "dir" : "row-reverse",
+            "layout" : "FLEX",
+            "vAlign" : "center"
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 8,
+            "colMD" : 8,
+            "colSM" : 8,
+            "colXS" : 8,
+            "layout" : "TABLE_24COL"
+          },
+          "infoGroupMode" : false,
+          "showCaption" : true
+        }, {
+          "actionGroupExtractMode" : "ITEM",
+          "caption" : "栅格嵌套栅格",
+          "codeName" : "grouppanel3",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "GROUPPANEL",
+          "name" : "grouppanel3",
+          "getPSDEFormDetails" : [ {
+            "caption" : "属性7",
+            "codeName" : "field7",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "field7",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD7",
+              "codeName" : "Field7"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 100,
+              "name" : "field7"
+            },
+            "getPSLayoutPos" : {
+              "colLG" : 8,
+              "colLGOffset" : 8,
+              "colMD" : 8,
+              "colMDOffset" : 8,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "属性8",
+            "codeName" : "field8",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "field8",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD8",
+              "codeName" : "Field8"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 100,
+              "name" : "field8"
+            },
+            "getPSLayoutPos" : {
+              "colLG" : 8,
+              "colLGOffset" : 4,
+              "colMD" : 8,
+              "colMDOffset" : 4,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          } ],
+          "getPSLayout" : {
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 8,
+            "colMD" : 8,
+            "colSM" : 8,
+            "colXS" : 8,
+            "layout" : "TABLE_24COL"
+          },
+          "infoGroupMode" : false,
+          "showCaption" : true
+        }, {
+          "actionGroupExtractMode" : "ITEM",
+          "caption" : "栅格自动",
+          "codeName" : "grouppanel4",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "GROUPPANEL",
+          "name" : "grouppanel4",
+          "getPSDEFormDetails" : [ {
+            "caption" : "属性9",
+            "codeName" : "field9",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "field9",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD9",
+              "codeName" : "Field9"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 100,
+              "name" : "field9"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "日期",
+            "codeName" : "field10",
+            "dataType" : 5,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "itemWidth" : 230.0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "field10",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD10",
+              "codeName" : "Field10"
+            },
+            "getPSEditor" : {
+              "dateTimeFormat" : "YYYY-MM-DD",
+              "editorParams" : {
+                "TIMEFMT" : "YYYY-MM-DD"
+              },
+              "editorType" : "DATEPICKEREX_NOTIME",
+              "editorWidth" : 100.0,
+              "name" : "field10"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "valueFormat" : "YYYY-MM-DD",
+            "allowEmpty" : true,
+            "showCaption" : true
+          } ],
+          "getPSLayout" : {
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 8,
+            "colMD" : 8,
+            "colSM" : 8,
+            "colXS" : 8,
+            "layout" : "TABLE_24COL"
+          },
+          "infoGroupMode" : false,
+          "showCaption" : true
+        } ],
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "columnCount" : 24,

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

@@ -8645,6 +8645,42 @@
         "name" : "FIELD4",
         "stdDataType" : 25,
         "stringLength" : 100
+      }, {
+        "codeName" : "Field5",
+        "logicName" : "属性5",
+        "name" : "FIELD5",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "codeName" : "Field6",
+        "logicName" : "属性6",
+        "name" : "FIELD6",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "codeName" : "Field7",
+        "logicName" : "属性7",
+        "name" : "FIELD7",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "codeName" : "Field8",
+        "logicName" : "属性8",
+        "name" : "FIELD8",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "codeName" : "Field9",
+        "logicName" : "属性9",
+        "name" : "FIELD9",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "codeName" : "Field10",
+        "logicName" : "日期",
+        "name" : "FIELD10",
+        "stdDataType" : 5,
+        "valueFormat" : "YYYY-MM-DD"
       } ],
       "getAllPSAppDEMethodDTOs" : [ {
         "codeName" : "BookDTO",
@@ -8724,6 +8760,18 @@
           "sourceType" : "DEFIELD",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "Field10",
+          "logicName" : "日期",
+          "name" : "Field10",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "FIELD10",
+            "codeName" : "Field10"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 5,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "Field2",
           "logicName" : "属性2",
@@ -8760,6 +8808,66 @@
           "sourceType" : "DEFIELD",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "Field5",
+          "logicName" : "属性5",
+          "name" : "Field5",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "FIELD5",
+            "codeName" : "Field5"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
+        }, {
+          "codeName" : "Field6",
+          "logicName" : "属性6",
+          "name" : "Field6",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "FIELD6",
+            "codeName" : "Field6"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
+        }, {
+          "codeName" : "Field7",
+          "logicName" : "属性7",
+          "name" : "Field7",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "FIELD7",
+            "codeName" : "Field7"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
+        }, {
+          "codeName" : "Field8",
+          "logicName" : "属性8",
+          "name" : "Field8",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "FIELD8",
+            "codeName" : "Field8"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
+        }, {
+          "codeName" : "Field9",
+          "logicName" : "属性9",
+          "name" : "Field9",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "FIELD9",
+            "codeName" : "Field9"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "OrgId",
           "logicName" : "组织机构标识",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -42,6 +42,12 @@
       "name" : "FIELD",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "FIELD10",
+      "logicName" : "日期",
+      "name" : "FIELD10",
+      "stdDataType" : 5,
+      "nullable" : true
     }, {
       "codeName" : "FIELD2",
       "length" : 100,
@@ -63,6 +69,41 @@
       "name" : "FIELD4",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "FIELD5",
+      "length" : 100,
+      "logicName" : "属性5",
+      "name" : "FIELD5",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD6",
+      "length" : 100,
+      "logicName" : "属性6",
+      "name" : "FIELD6",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD7",
+      "length" : 100,
+      "logicName" : "属性7",
+      "name" : "FIELD7",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD8",
+      "length" : 100,
+      "logicName" : "属性8",
+      "name" : "FIELD8",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD9",
+      "length" : 100,
+      "logicName" : "属性9",
+      "name" : "FIELD9",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "ORGID",
       "length" : 60,