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

app_Web/packages/ibiz-plugin/package.json

@@ -6,6 +6,7 @@
   "dependencies": {
     "element-resize-detector": "^1.2.2",
     "monaco-editor": "^0.24.0",
+    "json-editor": "^0.7.28",
     "monaco-editor-webpack-plugin": "^3.1.0",
     "vue-property-decorator": "^9.1.2"
   }

app_Web/packages/ibiz-plugin/src/components/app-json-schema-editor/app-json-schema-editor.tsx

+import { Component, Model, Prop, Vue, Watch } from 'vue-property-decorator';
+import 'json-editor';
+@Component({})
+export class AppJsonSchemaEditor extends Vue {
+
+    /**
+     * @description 传入值
+     * @type {string}
+     * @memberof AppJsonSchemaEditor
+     */
+    @Model('change')
+    value!: string;
+
+    @Watch('value')
+    onValueWatch() {
+        if (this.jsonSchemaEditor) {
+            this.jsonSchemaEditor.setValue(this.value);
+        }
+    }
+
+    /**
+     * @description 主题
+     * @type {('html' | 'foundation3' | 'foundation4' | 'foundation5'| 'foundation6' | 'jqueryui' | 'bootstrap2' | 'bootstrap3')}
+     * @memberof AppJsonSchemaEditor
+     */
+    @Prop({ type: String, default: 'bootstrap2' })
+    theme!: 'html' | 'foundation3' | 'foundation4' | 'foundation5'| 'foundation6' | 'jqueryui' | 'bootstrap2' | 'bootstrap3';
+
+    /**
+     * @description 图标库
+     * @type {('jqueryui' | 'fontawesome4' | null)}
+     * @memberof AppJsonSchemaEditor
+     */
+    @Prop({ type: String, default: 'jqueryui' })
+    iconlib!: 'jqueryui' | 'fontawesome4' | null;
+
+    /**
+     * @description 只读
+     * @type {boolean}
+     * @memberof AppJsonSchemaEditor
+     */
+    @Prop({ type: Boolean, default: false })
+    readonly!: boolean;
+
+    /**
+     * @description jsonSchema编辑器对象
+     * @type {*}
+     * @memberof AppJsonSchemaEditor
+     */
+    jsonSchemaEditor: any;
+
+    /**
+     * @description Vue生命周期，实例挂载完毕
+     * @memberof AppJsonSchemaEditor
+     */
+    mounted() {
+        this.initJsonEditor();
+    }
+
+    /**
+     * Vue实例销毁前
+     *
+     * @memberof AppJsonSchemaEditor
+     */
+    beforeDestroy() {
+        if (this.jsonSchemaEditor) {
+            this.jsonSchemaEditor.destroy();
+        }
+    }
+
+    /**
+     * @description 初始化Json编辑器
+     * @memberof AppJsonSchemaEditor
+     */
+    initJsonEditor() {
+        const jsonSchemaEditor = this.$refs.jsonSchemaEdito;
+        if (jsonSchemaEditor) {
+            this.jsonSchemaEditor = new (window as any).JSONEditor(jsonSchemaEditor, {
+                schema: {
+                    type: 'object',
+                },
+                theme: this.theme,
+                iconlib: this.iconlib,
+            });
+            this.registerEvent();
+        }
+    }
+
+    /**
+     * 注册事件
+     *
+     * @memberof AppJsonSchemaEditor
+     */
+    registerEvent() {
+        // 数据发生变化
+        if (this.readonly) {
+            this.jsonSchemaEditor.disable();
+        }
+        this.jsonSchemaEditor.on('change',() => {
+            this.$emit('change', this.jsonSchemaEditor.getValue());
+        });
+    }
+
+    /**
+     * @description 绘制josn编辑器
+     * @return {*} 
+     * @memberof AppJsonSchemaEditor
+     */
+    render() {
+        return (
+            <div class="app-json-editor">
+                <div class={{ "app-json-schema-editor__content": true, [`app-json-schema-editor__content--${this.theme}`]: true }} ref='jsonSchemaEdito'></div>
+            </div>
+        )
+    }
+}
+export default AppJsonSchemaEditor;
\ No newline at end of file

app_Web/packages/ibiz-plugin/src/components/app-plugin.ts

@@ -2,6 +2,7 @@ import { default as VueImport } from 'vue';
 
 export const AppPlugin = {
     install(vue: typeof VueImport) {
+        vue.component('app-json-schema-editor', () => import('./app-json-schema-editor/app-json-schema-editor'));
         vue.component('app-code-editor', () => import('./app-code-editor/app-code-editor'));
         vue.component('app-preset-input', () => import('./app-preset-input/app-preset-input.vue'));
         vue.component('app-preset-title', () => import('./app-preset-title/app-preset-title.vue'));

app_Web/packages/ibiz-vue/src/components/common/action-timeline/action-timeline.vue

@@ -11,15 +11,15 @@
                 <template v-for="(usertask, usertaskIndex) in data.usertasks">
                     <tr :key="usertaskIndex">
                         <td align="right" valign="top">
-                            <div class="tbody__date">
-                                <div class="tbody__date-usertaskname">{{ usertask.userTaskName }}</div>
-                                <div class="tbody__date-arrow" @click="changeExpand(usertask)">
+                            <div class="action-timeline-tbody__date">
+                                <div class="tbody__date__caption">{{ usertask.userTaskName }}</div>
+                                <div class="tbody__date__arrow" @click="changeExpand(usertask)">
                                     <i :class="usertask.isShow ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" />
                                 </div>
                             </div>
                         </td>
                         <td>
-                            <div class="tbody__timeline">
+                            <div class="action-timeline-tbody__timeline">
                                 <template v-if="usertask.identitylinks && usertask.identitylinks.length > 0">
                                     {{ $t('components.appwfapproval.wait') }}
                                     <strong>
@@ -35,7 +35,7 @@
                                     {{ $t('components.appwfapproval.handle') }}
                                 </template>
                                 <template v-else>
-                                    <ul class="action-timeline-wrapper">
+                                    <ul class="action-timeline-tbody__timeline__wrapper">
                                         <template v-if="!usertask.isShow">
                                             <li
                                                 v-if="usertask.comments && usertask.comments.length > 0"

app_Web/packages/ibiz-vue/src/components/common/app-debug-actions/app-debug-actions.vue

@@ -2,7 +2,7 @@
 <div class="app-debug-actions" v-if="isShow">
     <div class="app-debug-actions__actions">
         <button-group vertical>
-            <i-button :title="$t('components.appdebugactions.button')" :type="sdc.isShowTool ? 'warning' : 'info'" ghost @click="() => sdc.showToolChange()" :icon="sdc.isShowTool ? 'ios-bug' : 'ios-bug-outline'" ></i-button>
+            <i-button class="action__button" :title="$t('components.appdebugactions.button')" :type="sdc.isShowTool ? 'warning' : 'info'" ghost @click="() => sdc.showToolChange()" :icon="sdc.isShowTool ? 'ios-bug' : 'ios-bug-outline'" ></i-button>
         </button-group>
     </div>
     <div class="app-debug-actions__show-buttons">

app_Web/packages/ibiz-vue/src/components/common/app-form-group/app-form-group.vue

@@ -84,7 +84,7 @@
                     </span>
                     <slot name="dataInfoPanel"></slot>
                     <a v-if="isManageContainer" class='app-form-group__action__showmore' @click="doManageContainer">
-                        <icon :type=" manageContainerStatus ? 'ios-repeat' : 'ios-more' " />
+                        <icon :type=" manageContainerStatus ? 'ios-repeat' : 'ios-menu' " />
                         {{manageContainerStatus?$t('components.appformgroup.hide'):$t('components.appformgroup.showmore')}}
                     </a>
                 </template>

app_Web/packages/ibiz-vue/src/components/common/app-header-right-menus/app-header-right-menus.tsx

@@ -195,7 +195,7 @@ export class AppHeaderRightMenus extends Vue {
      */
     public render(): any {
         return (
-            <div class="app-header-menus">
+            <div class="app-header-right-menus">
                 <i-menu mode="horizontal" on-on-select={(val: string) => this.onSelect(val)}>
                     {this.renderMenus(this.menus)}
                 </i-menu>

app_Web/packages/ibiz-vue/src/components/common/app-lock-scren/app-lock-scren.vue

@@ -18,7 +18,7 @@
                 </el-form-item>
             </el-form>
             <span slot="footer">
-                <el-button type="primary" @click="handleSetLock">{{$t('components.lockscren.confirmbuttontext')}}</el-button>
+                <el-button class="lock-scren-footer-btn" type="primary" @click="handleSetLock">{{$t('components.lockscren.confirmbuttontext')}}</el-button>
             </span>
         </el-dialog>
     </div>

app_Web/packages/ibiz-vue/src/components/common/extend-action-timeline/extend-action-timeline.vue

@@ -5,17 +5,17 @@
             <div class="extend-action-timeline-body" v-if="data && data.usertasks">
                 <div class="timeline-draw extend-action-timeline-body__timeline timeline-head">
                     <div class="timeline-wrapper">
-                        <div class="timeline-index">{{ $t('components.timeline.index') }}</div>
-                        <div class="usertaskname">{{ $t('components.timeline.node') }}</div>
-                        <div class="authorname">{{ $t('components.timeline.author') }}</div>
-                        <div class="type">{{ $t('components.timeline.type') }}</div>
-                        <div class="last-time">{{ $t('components.timeline.lasttime') }}</div>
-                        <div class="fullmessage">{{ $t('components.timeline.opinion') }}</div>
+                        <div class="timeline-wrapper__timeline-index">{{ $t('components.timeline.index') }}</div>
+                        <div class="timeline-wrapper__usertaskname">{{ $t('components.timeline.node') }}</div>
+                        <div class="timeline-wrapper__authorname">{{ $t('components.timeline.author') }}</div>
+                        <div class="timeline-wrapper__type">{{ $t('components.timeline.type') }}</div>
+                        <div class="timeline-wrapper__last-time">{{ $t('components.timeline.lasttime') }}</div>
+                        <div class="timeline-wrapper__fullmessage">{{ $t('components.timeline.opinion') }}</div>
                     </div>
-                    <div class="timeline__arrow"></div>
+                    <div class="timeline-arrow"></div>
                 </div>
                 <template v-for="(usertask, usertaskIndex) in data.usertasks">
-                    <div v-if="usertask.comments.length > 0" class="extend-action-timeline-body__timeline timeline-content" :key="usertaskIndex">
+                    <div v-if="usertask.comments.length > 0" class="timeline-content" :key="usertaskIndex">
                         <div class="extend-action-timeline-body__timeline">
                             <div class="timeline-wrapper">
                                 <div class="timeline-wrapper__timeline-index">
@@ -42,7 +42,7 @@
                                                 .toString()
                                         }}
                                         <div slot="content">
-                                            <div class="tooltips">
+                                            <div class="timeline-wrapper__authorname__tooltips">
                                                 <div
                                                     class="tooltips-content"
                                                     v-for="(item, toolindex) in acceptingOfficerNodup(
@@ -79,7 +79,7 @@
                                         )
                                     }}
                                 </div>
-                                <el-popover class="timeline-wrapper__tootip" placement="top" :width="500" trigger="hover">
+                                <el-popover class="timeline-wrapper__tooltip" placement="top" :width="500" trigger="hover">
                                     <div slot="reference">
                                         {{
                                             usertask.comments[usertask.comments.length - 1] &&
@@ -96,7 +96,7 @@
                             </div>
                             <div
                                 v-if="usertask.comments.length > 1 || usertask.identitylinks.length > 0"
-                                class="timeline__arrow"
+                                class="timeline-arrow"
                                 @click="changeExpand(usertask)"
                             >
                                 <i :class="usertask.isShow ? 'el-icon-minus' : 'el-icon-plus'" />
@@ -122,7 +122,7 @@
                                         </div>
                                         <div class="timeline-wrapper__fullmessage">{{ comment.fullMessage }}</div>
                                     </div>
-                                    <div class="timeline__arrow"></div>
+                                    <div class="timeline-arrow"></div>
                                 </div>
                             </template>
                             <div
@@ -192,7 +192,7 @@
                                     </Tooltip>
                                 </div>
                             </div>
-                            <div v-if="usertask.identitylinks.length > 1" class="timeline__arrow" @click="changeExpand(usertask)">
+                            <div v-if="usertask.identitylinks.length > 1" class="timeline-arrow" @click="changeExpand(usertask)">
                                 <i :class="usertask.isShow ? 'el-icon-minus' : 'el-icon-plus'" />
                             </div>
                         </div>
@@ -208,7 +208,7 @@
                                             {{ identitylink.displayname }}
                                         </div>
                                     </div>
-                                    <div class="timeline__arrow"></div>
+                                    <div class="timeline-arrow"></div>
                                 </div>
                             </template>
                         </div>

app_Web/packages/ibiz-vue/src/components/editor/textbox-editor/textbox-editor.tsx

@@ -241,6 +241,25 @@ export default class TextboxEditor extends EditorBase {
         })
     }
 
+
+    /**
+     * @description 绘制JsonSchema编辑器
+     * @memberof TextboxEditor
+     */
+    public renderJsonSchema() {
+        return this.$createElement(this.editorComponentName, {
+            props: {
+                value: this.value,
+                ...this.handleParams(this.customProps),
+            },
+            on: {
+                change: this.handleChange,
+            },
+            class:this.dynaClass,
+            style: this.customStyle
+        })
+    }
+
     /**
      * 绘制内容
      *
@@ -268,6 +287,8 @@ export default class TextboxEditor extends EditorBase {
             case 'MARKDOWN':
             case "TEXTAREA_10_WFOPINION":
                 return this.renderTextbox();
+            case "TEXTBOX_JSONSCHEMA":
+                return this.renderJsonSchema();
             case "TEXTBOX_COLORPICKER":
                 return this.renderTextboxColorPicker();
             case "TEXTAREA_WFAPPROVAL":

app_Web/packages/ibiz-vue/src/styles/components/common/action-timeline.less

@@ -19,7 +19,7 @@
     td {
         position: relative;
 
-        >.tbody__date {
+        .action-timeline-tbody__date {
             display: flex;
             width: 200px;
             display: flex;
@@ -28,13 +28,13 @@
             background-color: #f5f5f5;
             border-radius: 8px;
             font-size: 16px;
+        }
 
-            .arrow {
+        .tbody__date__arrow {
             margin-left: 10px;
         }
-        }
 
-        >.tbody__date::before {
+        .action-timeline-tbody__date::before {
             content: ' ';
             display: block;
             position: absolute;
@@ -44,18 +44,15 @@
             width: 20px;
             background-color: black;
         }
-    }
-}
-
->.tbody__timeline {
+        >.action-timeline-tbody__timeline {
             padding: 16px;
             min-height: 68px;
             margin-left: 18px;
             background-color: #f5f5f5;
             border-radius: 8px;
-}
-
-.action-timeline-wrapper {
+        }
+    }
+    .action-timeline-tbody__timeline__wrapper {
         padding-left: 165px;
         color: #57A3FD;
     
@@ -65,23 +62,21 @@
             display: list-item;
             list-style: none;
             top: -6px;
-
-        >.action-timeline-item__time {
+        }
+        .action-timeline-item__time {
             position: absolute;
             left: -115px;
-            top: 5px;
+            top: 7px;
             font-size: 12px;
         }
-
-        >.action-timeline-item__content {
+        .action-timeline-item__content {
             padding: 5px;
             padding-left: 65px;
         }
-    }
     
         .action-timeline-item::before {
             position: absolute;
-        top: 17px;
+            top: 13px;
             left: 45px;
             z-index: 3;
             width: 7px;
@@ -102,4 +97,8 @@
             content: ' ';
             border-left: 1px solid black;
         }
+    }
 }
+
+
+

app_Web/packages/ibiz-vue/src/styles/components/common/app-header-menus.less

@@ -3,7 +3,7 @@
     align-items: center;
     height: 100%;
     line-height: 20px;
-
+    margin-right: 100px;
     >.app-header-menu-item {
         height: 24px;
         display: flex;

app_Web/packages/ibiz-vue/src/styles/components/common/app-header-right-menus.less

-.app-header-menus {
+.app-header-right-menus {
     margin-right: 200px;
     > .ivu-menu.ivu-menu-horizontal {        
         height: 35px;

app_Web/packages/ibiz-vue/src/styles/components/common/extend-action-timeline.less

@@ -37,11 +37,11 @@
 .extend-action-timeline-body {
     width: 100%;
 
-    .timeline-content .authorname {
+    .timeline-content .timeline-wrapper__authorname {
         color: #57a3fd;
     }
 
-    .tooltips {
+    .timeline-wrapper__authorname__tooltips {
         width: 214px;
         display: flex;
         flex-wrap: wrap;
@@ -56,7 +56,7 @@
         height: auto;
         background-color: #fafafa;
         border-bottom: 1px solid #e8eaec;
-
+        }
         .timeline-wrapper {
             height: auto;
         }
@@ -81,7 +81,6 @@
             }
         }
     }
-}
 
 .extend-action-timeline-body__timeline {
     position: relative;
@@ -105,7 +104,7 @@
             text-overflow: ellipsis;
         }
 
-        .timeline-wrapper__tootip .el-popover__reference {
+        .timeline-wrapper__tooltip .el-popover__reference {
             max-width: 500px;
             overflow: hidden;
             white-space: nowrap;
@@ -208,7 +207,7 @@
         min-width: 100px;
     }
 
-    .timeline__arrow {
+    .timeline-arrow {
         position: absolute;
         right: 24px;
         bottom: 50%;

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

@@ -393,6 +393,15 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
         const arg: any = { ...opt };
         let viewparamResult: any = Object.assign(arg, this.viewparams);
         let tempContext: any = JSON.parse(JSON.stringify(this.context));
+        // 处理新建默认值（表单数据覆盖视图参数）V8由请求响应处理新建默认值调整为请求前处理新建默认值
+        this.createDefault();
+        if(this.data && Object.keys(this.data).length >0){
+            Object.keys(this.data).forEach((key:string) =>{
+                if(this.data[key] !== null){
+                    Object.assign(viewparamResult,{[key]: this.data[key]});
+                }
+            })
+        }
         if (!(await this.handleCtrlEvents('onbeforeloaddraft', { action: this.loaddraftAction, navParam: viewparamResult }))) {
             return;
         }
@@ -1168,9 +1177,6 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
             }
         }
         Object.assign(this.data, tempData);
-        if (Object.is(action, 'loadDraft')) {
-            this.createDefault();
-        }
         if (Object.is(action, 'load')) {
             this.updateDefault();
         }

app_Web/public/assets/theme/default.less

@@ -1856,8 +1856,16 @@ body {
 }
 
 .app-debug-actions__show-buttons{
-    border: @color-primary-base;
-    color: @color-primary-base;
+    border: @color-primary-contrast;
+    color: @color-primary-contrast;
+}
+.app-debug-actions__actions{
+    .action__button{
+        color: @color-primary-contrast;
+    }
+    .ivu-btn-ghost.ivu-btn-info:hover{
+        color: @color-primary-contrast;
+    }
 }
 
 .app-upload-file-info__item:hover {
@@ -2170,3 +2178,20 @@ body {
         }
     }
 }
+
+.lock-scren-footer-btn.el-button--primary{
+    background-color: @button-high-background-color;
+    color: @button-high-text-color;
+    border: @button-high-border-color;
+    &:hover{
+        background-color: @button-high-background-color--hover;
+        color: @button-high-text-color--hover;
+        border: @button-high-border-color--hover;
+    }
+}
+.lockscren-body .el-dialog__headerbtn:hover i{
+    color: @color-primary-base;
+    >i:hover{
+        color: @color-primary-base;
+    }
+}
\ No newline at end of file

app_Web/src/locale/lanres/components/components_en_US_base.ts

@@ -246,8 +246,8 @@ function getLocaleResourceBase(){
           applytheme: 'Share link created',
         },
         appformgroup: {
-          hide: 'hide',
-          showmore: 'show more',
+            hide: 'hide field',
+            showmore: 'show field',
         },
         appupdatepassword: {
           oldpwd: 'Original password',

app_Web/src/locale/lanres/components/components_zh_CN_base.ts

@@ -248,7 +248,7 @@ function getLocaleResourceBase(){
         },
         appformgroup: {
             hide: '隐藏字段',
-          showmore: '显示更多字段',
+            showmore: '显示字段',
         },
         appupdatepassword: {
           oldpwd: '原密码',

app_Web/src/template.html

@@ -10,6 +10,7 @@
     <link type="text/css" href="./assets/css/loading.css" rel="stylesheet">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <link rel="stylesheet/less" href="./assets/theme/default.less"/>
+    <link rel='stylesheet/less' href="./assets/jsoneditor/bootstrap2.less">
     <!-- <link rel='stylesheet' href='./assets/luckysheet/plugins/css/pluginsCss.css' />
     <link rel='stylesheet' href='./assets/luckysheet/plugins/plugins.css' />
     <link rel='stylesheet' href='./assets/luckysheet/css/luckysheet.css' />

app_Web/src/utils/service/app-component-service.ts

@@ -333,6 +333,7 @@ export class AppComponentService {
         this.editorMap.set('MOBMULTIFILEUPLOAD_DEFAULT','app-file-upload');
         this.editorMap.set('SPAN_DEFAULT','app-span');
         // 预置扩展编辑器
+        this.editorMap.set("TEXTBOX_JSONSCHEMA", "app-json-schema-editor");
         this.editorMap.set("MDROPDOWNLIST_CRONEDITOR", "cron-editor");
         this.editorMap.set("DROPDOWNLIST_HIDDEN", "dropdown-list-hidden");
         this.editorMap.set("MDROPDOWNLIST_TRANSFER", "app-transfer");

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

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-222-3">
+    <changeSet author="root" id="tab-book-223-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>

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

@@ -198,13 +198,6 @@
       "name" : "FIELD18",
       "codeName" : "Field18"
     }
-  }, {
-    "id" : "field7",
-    "dataType" : 25,
-    "getPSAppDEField" : {
-      "name" : "FIELD7",
-      "codeName" : "Field7"
-    }
   }, {
     "id" : "field8",
     "dataType" : 25,
@@ -677,32 +670,6 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
-      }, {
-        "caption" : "HTML",
-        "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" : "HTMLEDITOR",
-          "name" : "field7"
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "allowEmpty" : true,
-        "showCaption" : true
       }, {
         "caption" : "密码框",
         "codeName" : "field8",
@@ -1470,34 +1437,34 @@
             "getPSAppViewLogics" : [ {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
               }
             }, {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
               }
             } ],
             "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
               },
-              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             }, {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
               },
+              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             } ],
             "getPSControlHandler" : {
@@ -1714,6 +1681,28 @@
               "getPSDEUIActionGroup" : {
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : false,
+                  "showCaption" : true,
+                  "showIcon" : false
+                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -1741,28 +1730,6 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
-                }, {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : false,
-                  "showCaption" : true,
-                  "showIcon" : false
                 } ]
               },
               "width" : 100,

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

@@ -60,34 +60,34 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u479f517_click",
+    "name" : "grid_uagridcolumn1_ua98d563_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_行编辑开关操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_ua98d563_click",
+    "name" : "grid_uagridcolumn1_u479f517_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_行编辑开关操作"
+      "id" : "表格界面_编辑操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_行编辑开关操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "ToggleRowEdit"
     },
-    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   }, {
-    "name" : "表格界面_行编辑开关操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "ToggleRowEdit"
+      "id" : "Edit"
     },
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   } ],
   "getPSControlLogics" : [ {
@@ -217,6 +217,28 @@
     "getPSDEUIActionGroup" : {
       "name" : "操作列",
       "getPSUIActionGroupDetails" : [ {
+        "detailType" : "DEUIACTION",
+        "name" : "ua98d563",
+        "getPSUIAction" : {
+          "caption" : "行编辑",
+          "codeName" : "ToggleRowEdit",
+          "fullCodeName" : "ToggleRowEdit",
+          "name" : "表格界面_行编辑开关操作",
+          "getPSSysImage" : {
+            "glyph" : "xf0ce@FontAwesome",
+            "cssClass" : "fa fa-table"
+          },
+          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "ToggleRowEdit",
+          "uIActionType" : "DEUIACTION",
+          "enableToggleMode" : true
+        },
+        "addSeparator" : false,
+        "showCaption" : true,
+        "showIcon" : false
+      }, {
         "detailType" : "DEUIACTION",
         "name" : "u479f517",
         "getPSUIAction" : {
@@ -244,28 +266,6 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : true
-      }, {
-        "detailType" : "DEUIACTION",
-        "name" : "ua98d563",
-        "getPSUIAction" : {
-          "caption" : "行编辑",
-          "codeName" : "ToggleRowEdit",
-          "fullCodeName" : "ToggleRowEdit",
-          "name" : "表格界面_行编辑开关操作",
-          "getPSSysImage" : {
-            "glyph" : "xf0ce@FontAwesome",
-            "cssClass" : "fa fa-table"
-          },
-          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-          "timeout" : 60000,
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "ToggleRowEdit",
-          "uIActionType" : "DEUIACTION",
-          "enableToggleMode" : true
-        },
-        "addSeparator" : false,
-        "showCaption" : true,
-        "showIcon" : false
       } ]
     },
     "width" : 100,

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

@@ -553,34 +553,34 @@
           "getPSAppViewLogics" : [ {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_u479f517_click",
+            "name" : "grid_uagridcolumn1_ua98d563_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_编辑操作"
+              "id" : "表格界面_行编辑开关操作"
             }
           }, {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_ua98d563_click",
+            "name" : "grid_uagridcolumn1_u479f517_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_行编辑开关操作"
+              "id" : "表格界面_编辑操作"
             }
           } ],
           "getPSAppViewUIActions" : [ {
-            "name" : "表格界面_编辑操作",
+            "name" : "表格界面_行编辑开关操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "Edit"
+              "id" : "ToggleRowEdit"
             },
-            "uIActionTarget" : "SINGLEKEY",
             "xDataControlName" : "grid"
           }, {
-            "name" : "表格界面_行编辑开关操作",
+            "name" : "表格界面_编辑操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "ToggleRowEdit"
+              "id" : "Edit"
             },
+            "uIActionTarget" : "SINGLEKEY",
             "xDataControlName" : "grid"
           } ],
           "getPSControlHandler" : {
@@ -797,6 +797,28 @@
             "getPSDEUIActionGroup" : {
               "name" : "操作列",
               "getPSUIActionGroupDetails" : [ {
+                "detailType" : "DEUIACTION",
+                "name" : "ua98d563",
+                "getPSUIAction" : {
+                  "caption" : "行编辑",
+                  "codeName" : "ToggleRowEdit",
+                  "fullCodeName" : "ToggleRowEdit",
+                  "name" : "表格界面_行编辑开关操作",
+                  "getPSSysImage" : {
+                    "glyph" : "xf0ce@FontAwesome",
+                    "cssClass" : "fa fa-table"
+                  },
+                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                  "timeout" : 60000,
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "ToggleRowEdit",
+                  "uIActionType" : "DEUIACTION",
+                  "enableToggleMode" : true
+                },
+                "addSeparator" : false,
+                "showCaption" : true,
+                "showIcon" : false
+              }, {
                 "detailType" : "DEUIACTION",
                 "name" : "u479f517",
                 "getPSUIAction" : {
@@ -824,28 +846,6 @@
                 "addSeparator" : true,
                 "showCaption" : true,
                 "showIcon" : true
-              }, {
-                "detailType" : "DEUIACTION",
-                "name" : "ua98d563",
-                "getPSUIAction" : {
-                  "caption" : "行编辑",
-                  "codeName" : "ToggleRowEdit",
-                  "fullCodeName" : "ToggleRowEdit",
-                  "name" : "表格界面_行编辑开关操作",
-                  "getPSSysImage" : {
-                    "glyph" : "xf0ce@FontAwesome",
-                    "cssClass" : "fa fa-table"
-                  },
-                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                  "timeout" : 60000,
-                  "uIActionMode" : "SYS",
-                  "uIActionTag" : "ToggleRowEdit",
-                  "uIActionType" : "DEUIACTION",
-                  "enableToggleMode" : true
-                },
-                "addSeparator" : false,
-                "showCaption" : true,
-                "showIcon" : false
               } ]
             },
             "width" : 100,

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

@@ -373,34 +373,34 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
       },
-      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
       },
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -617,6 +617,28 @@
       "getPSDEUIActionGroup" : {
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : false,
+          "showCaption" : true,
+          "showIcon" : false
+        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -644,28 +666,6 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
-        }, {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : false
         } ]
       },
       "width" : 100,

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

@@ -425,34 +425,34 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
       },
-      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
       },
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -669,6 +669,28 @@
       "getPSDEUIActionGroup" : {
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : false,
+          "showCaption" : true,
+          "showIcon" : false
+        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -696,28 +718,6 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
-        }, {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : false
         } ]
       },
       "width" : 100,

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

@@ -319,13 +319,6 @@
         "name" : "FIELD18",
         "codeName" : "Field18"
       }
-    }, {
-      "id" : "field7",
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "FIELD7",
-        "codeName" : "Field7"
-      }
     }, {
       "id" : "field8",
       "dataType" : 25,
@@ -798,32 +791,6 @@
           },
           "allowEmpty" : true,
           "showCaption" : true
-        }, {
-          "caption" : "HTML",
-          "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" : "HTMLEDITOR",
-            "name" : "field7"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "allowEmpty" : true,
-          "showCaption" : true
         }, {
           "caption" : "密码框",
           "codeName" : "field8",
@@ -1591,34 +1558,34 @@
               "getPSAppViewLogics" : [ {
                 "logicTrigger" : "CUSTOM",
                 "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_u479f517_click",
+                "name" : "grid_uagridcolumn1_ua98d563_click",
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "表格界面_编辑操作"
+                  "id" : "表格界面_行编辑开关操作"
                 }
               }, {
                 "logicTrigger" : "CUSTOM",
                 "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_ua98d563_click",
+                "name" : "grid_uagridcolumn1_u479f517_click",
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "表格界面_行编辑开关操作"
+                  "id" : "表格界面_编辑操作"
                 }
               } ],
               "getPSAppViewUIActions" : [ {
-                "name" : "表格界面_编辑操作",
+                "name" : "表格界面_行编辑开关操作",
                 "getPSUIAction" : {
                   "modelref" : true,
-                  "id" : "Edit"
+                  "id" : "ToggleRowEdit"
                 },
-                "uIActionTarget" : "SINGLEKEY",
                 "xDataControlName" : "grid"
               }, {
-                "name" : "表格界面_行编辑开关操作",
+                "name" : "表格界面_编辑操作",
                 "getPSUIAction" : {
                   "modelref" : true,
-                  "id" : "ToggleRowEdit"
+                  "id" : "Edit"
                 },
+                "uIActionTarget" : "SINGLEKEY",
                 "xDataControlName" : "grid"
               } ],
               "getPSControlHandler" : {
@@ -1835,6 +1802,28 @@
                 "getPSDEUIActionGroup" : {
                   "name" : "操作列",
                   "getPSUIActionGroupDetails" : [ {
+                    "detailType" : "DEUIACTION",
+                    "name" : "ua98d563",
+                    "getPSUIAction" : {
+                      "caption" : "行编辑",
+                      "codeName" : "ToggleRowEdit",
+                      "fullCodeName" : "ToggleRowEdit",
+                      "name" : "表格界面_行编辑开关操作",
+                      "getPSSysImage" : {
+                        "glyph" : "xf0ce@FontAwesome",
+                        "cssClass" : "fa fa-table"
+                      },
+                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                      "timeout" : 60000,
+                      "uIActionMode" : "SYS",
+                      "uIActionTag" : "ToggleRowEdit",
+                      "uIActionType" : "DEUIACTION",
+                      "enableToggleMode" : true
+                    },
+                    "addSeparator" : false,
+                    "showCaption" : true,
+                    "showIcon" : false
+                  }, {
                     "detailType" : "DEUIACTION",
                     "name" : "u479f517",
                     "getPSUIAction" : {
@@ -1862,28 +1851,6 @@
                     "addSeparator" : true,
                     "showCaption" : true,
                     "showIcon" : true
-                  }, {
-                    "detailType" : "DEUIACTION",
-                    "name" : "ua98d563",
-                    "getPSUIAction" : {
-                      "caption" : "行编辑",
-                      "codeName" : "ToggleRowEdit",
-                      "fullCodeName" : "ToggleRowEdit",
-                      "name" : "表格界面_行编辑开关操作",
-                      "getPSSysImage" : {
-                        "glyph" : "xf0ce@FontAwesome",
-                        "cssClass" : "fa fa-table"
-                      },
-                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                      "timeout" : 60000,
-                      "uIActionMode" : "SYS",
-                      "uIActionTag" : "ToggleRowEdit",
-                      "uIActionType" : "DEUIACTION",
-                      "enableToggleMode" : true
-                    },
-                    "addSeparator" : false,
-                    "showCaption" : true,
-                    "showIcon" : false
                   } ]
                 },
                 "width" : 100,

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

@@ -1539,34 +1539,34 @@
             "getPSAppViewLogics" : [ {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
               }
             }, {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
               }
             } ],
             "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
               },
-              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             }, {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
               },
+              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             } ],
             "getPSControlHandler" : {
@@ -1783,6 +1783,28 @@
               "getPSDEUIActionGroup" : {
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : false,
+                  "showCaption" : true,
+                  "showIcon" : false
+                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -1810,28 +1832,6 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
-                }, {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : false,
-                  "showCaption" : true,
-                  "showIcon" : false
                 } ]
               },
               "width" : 100,

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

@@ -229,6 +229,11 @@
       },
       "tooltip" : "报销单明细"
     }, {
+      "accUserMode" : 0,
+      "caption" : "子菜单3",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem15",
+      "getPSAppMenuItems" : [ {
         "accUserMode" : 2,
         "caption" : "学员信息管理test",
         "itemType" : "MENUITEM",
@@ -247,6 +252,11 @@
         },
         "tooltip" : "学员信息管理test"
       }, {
+        "accUserMode" : 0,
+        "caption" : "子菜单4",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem16",
+        "getPSAppMenuItems" : [ {
           "accUserMode" : 2,
           "caption" : "学生信息管理",
           "itemType" : "MENUITEM",
@@ -265,6 +275,28 @@
           },
           "tooltip" : "学生信息管理"
         } ],
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "子菜单4",
+        "expanded" : true
+      } ],
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "tooltip" : "子菜单3",
+      "expanded" : true
+    } ],
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,
       "id" : "appmenu"

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

@@ -125,6 +125,11 @@
     },
     "tooltip" : "报销单明细"
   }, {
+    "accUserMode" : 0,
+    "caption" : "子菜单3",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem15",
+    "getPSAppMenuItems" : [ {
       "accUserMode" : 2,
       "caption" : "学员信息管理test",
       "itemType" : "MENUITEM",
@@ -135,6 +140,11 @@
       },
       "tooltip" : "学员信息管理test"
     }, {
+      "accUserMode" : 0,
+      "caption" : "子菜单4",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem16",
+      "getPSAppMenuItems" : [ {
         "accUserMode" : 2,
         "caption" : "学生信息管理",
         "itemType" : "MENUITEM",
@@ -145,6 +155,12 @@
         },
         "tooltip" : "学生信息管理"
       } ],
+      "tooltip" : "子菜单4",
+      "expanded" : true
+    } ],
+    "tooltip" : "子菜单3",
+    "expanded" : true
+  } ],
   "enableCustomize" : false,
   "name" : "appindex",
   "modelid" : "6A3E233F-FB4A-493B-B3C2-1860D5502904",