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

app_Web/CHANGELOG.md

+## v8.0.3 [2022-9-16]
+
+## 2022-09-16
+
+更新前后台都支持，以后台优先[db01c4fb](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/db01c4fb78a16c994db8f27e64d71df9d2271859)（by tony001）
+
+更新表格导出[dc3fea20](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/dc3fea2033996417517fd1a9fd2c1da906f90aa4)（by ShineKOT）
+
+新增按钮动态标题支持[81fce1c5](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/81fce1c505a0661ab9f2363689d9d6ee544406e4)[b8113954](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/b8113954a0c1556706b679ad217f874e87f02ee3)（by ShineKOT）
+
+更新实体逻辑和界面逻辑准备处理参数节点[1ac62032](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/1ac62032f0716188a10b512a31c785bdbe40259d)（by ShineKOT）
+
+代码表翻译服务逻辑调整[272aaaca](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/272aaaca15e61d981efd6468f1515f6ee659a454)（by ShineKOT）
+
+更新代码编辑器[af9badf0](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/af9badf02d7c9be182f0b1fba48977d7bb878c75)[b1a46a2a](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/b1a46a2ae21477c7a41338aa7c10defd19331fb9)[a13ce24f](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/a13ce24f26b33eef462940af6b608829c8a2a828)[d26517ec](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d26517ecaa8496b6b5a585354f4046318be8bc0a)（by ShineKOT）
+
+flex布局高度调整[723adc23](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/723adc23380e64114b7ff198f92ffb231b5e2390)（by ShineKOT）
+
+新增动态样式[ba2dcafb](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/ba2dcafbca026a4b25d4ce6270655789f84736bd)（by zhangkang）
+
+修复列表模型数据类型错误导致合并数据错误[c66f5d8b](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/c66f5d8b2db33278f5d210784a9cce9248894250)（by ShineKOT）
+
+新增支持快速搜索自定义[bdf47503](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/bdf4750372756b73335449f466c40d5548693d68)（by ShineKOT）
+
+列表视图支持配置列表项的样式表[47188e4a](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/47188e4ac92cfba1c810c4495447e6da313f55c9)（by ShineKOT）
+
+卡片视图支持配置卡片项的样式表[f2193a8b](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/f2193a8b9c52656a93e24887360777397a07f58d)（by ShineKOT）
+
+视图，部件，组件等样式调整
+## v8.0.2 [2022-9-09]
+
+## 2022-09-09
+
+修复下拉工具栏显示图标配置失效[62c44fb2](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/62c44fb2f0abf63a5e05d92cc0ea4f127a9692e5)（by ibiz_zhf）
+
+应用标题名称动态适配[4a04ad05](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/4a04ad05e55a376041841613f1ebc3a891e4fc6e)[515de030](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/515de0306d50df84b223048f8bd56de5aea8c02a)（by tony001）
+
+调整菜单项宽度为320px[803be638](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/803be63881b257424ab1759f58971436e02c7b65)（by ibiz_zhf）
+
+新增支持系统样式表动态挂载[d247065b](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d247065b5f396b92396d0344f945045b7b8e0cce)（by tony001）
+
+修复抽屉中按下鼠标，抽屉外放开鼠标关闭抽屉[295c66ac](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/295c66aca2f40a8632e374990c35f524b6e7d720)[da6731ef](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/da6731efe5e0a14358001670f84afcc9d5a30d9f)（by ShineKOT）
+
+更新分组导出按钮支持导出页数选择[80b19fbc](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/80b19fbccccf395fb72378367cf2614a8178d32a)（by ibiz_zhf）
+
+删除下拉列表的click监听事件，防止重复触发事件[d757b223](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d757b22300e8842d55a96046d0690bcbba5a603a)（by ibiz_zhf）
+
+更新面板容器动态样式表[d059a72c](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d059a72c6f3c3f940747d95f0e48554b10c46145)（by tony001）
+
+调整视图标题[c42f8edb](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/c42f8edb5eccc17714a024dce1cd9717e0338e0e)（by tony001）
+
+视图，部件，组件等样式调整
+
 ## v8.0.1 [2022-9-02]
 
 ## 2022-09-02

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

@@ -7,6 +7,7 @@ import {
 } from '@ibiz/dynamic-model-api';
 import { DataServiceHelp, ModelTool, UIActionTool, Util } from 'ibiz-core';
 import { AppCenterService, AppGlobalService } from '../app-service';
+import { NoticeHandler } from '../utils';
 import { AppDEUIAction } from './app-ui-action';
 import { UIActionResult } from './appuilogic';
 
@@ -215,7 +216,9 @@ export class AppBackEndAction extends AppDEUIAction {
                                 viewLoadingService.isLoading = false;
                                 if (this.actionModel.showBusyIndicator) {
                                     if (this.actionModel.successMsg) {
+                                        NoticeHandler.message(response,() =>{
                                             actionContext.$success(this.actionModel.successMsg, 'AppBackEndAction');
+                                        })
                                     }
                                 }
                                 if (

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

@@ -21,11 +21,8 @@
                       <span>{{caption}}</span>
                 </p>
                 <template slot='extra'>
-                    <template v-if="uiActionGroup">
-                    <span class="app-form-group__actions">
-                        <a>
-                            <template v-if="uiActionGroup.extractMode && Object.is(uiActionGroup.extractMode, 'ITEMS')">
-                                <dropdown :transfer="true" trigger='click'>
+                    <span v-if="uiActionGroup" class="app-form-group__actions">
+                        <dropdown v-if="uiActionGroup.extractMode && Object.is(uiActionGroup.extractMode, 'ITEMS')" :transfer="true" trigger='click'>
                             <a href='javascript:void(0)'>
                                 {{uiActionGroup.caption}}
                             </a>
@@ -57,12 +54,9 @@
                                 </dropdown-item>
                             </dropdown-menu>
                         </dropdown>
-                            </template>
-                            <template v-if="!(uiActionGroup.extractMode && Object.is(uiActionGroup.extractMode, 'ITEMS'))">
-                                <span class='app-form-group__action__extract'>
-                                    <template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
+                        <span v-else-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)" class='app-form-group__action__extract'>
                             <div v-for="(detail,index) in uiActionGroup.details" :key="index">
-                                            <span v-show="detail.visible" :class="{'app-form-group__action__item': true, 'is-disable': detail.disabled}" @click="doUIAction($event, detail)">
+                                <a v-show="detail.visible" :class="{'app-form-group__action__item': true, 'is-disable': detail.disabled}" @click="doUIAction($event, detail)">
                                     <template v-if="detail.isShowIcon">
                                         <template v-if="detail.icon && !Object.is(detail.icon, '')">
                                             <i :class="detail.icon" ></i>
@@ -84,15 +78,15 @@
                                             </template>
                                         </template>
                                     </span>
-                                        </span>
+                                </a>
                             </div>
-                                    </template>
                         </span>
-                            </template>
-                        </a >
                     </span>
-                    </template>
                     <slot name="dataInfoPanel"></slot>
+                    <a v-if="isManageContainer" class='app-form-group__action__showmore' @click="doManageContainer">
+                        <icon :type=" manageContainerStatus ? 'ios-repeat' : 'ios-more' " />
+                        {{manageContainerStatus?$t('components.appformgroup.hide'):$t('components.appformgroup.showmore')}}
+                    </a>
                 </template>
                 <template v-if="Object.is(layoutType, 'FLEX')">
                     <slot></slot>
@@ -100,11 +94,6 @@
                 <template v-if="!Object.is(layoutType, 'FLEX')">
                     <row :gutter="10"><slot></slot></row>
                 </template>
-                <template v-if="isManageContainer">
-                    <i-button type="primary" :icon="manageContainerStatus?'ios-repeat':'ios-more'" @click="doManageContainer">
-                        {{manageContainerStatus?$t('components.appformgroup.hide'):$t('components.appformgroup.showmore')}}
-                    </i-button>
-                </template>
             </card>
             <template v-if="isShowCaption === false">
                 <slot></slot>

app_Web/packages/ibiz-vue/src/components/common/app-studioaction/app-studioaction.vue

@@ -248,7 +248,7 @@ export default class AppStudioAction extends Vue {
         if (this.isDevMode) {
             return (
                 <div
-                    class='app-studio-debug-bar-container'
+                    class={{'app-studio-debug-bar-container':true,'isblock':this.sdc.isShowTool,'isnone':!this.sdc.isShowTool}}
                     ref='debugBar'
                     style={{ display: this.sdc.isShowTool ? 'block' : 'none' }}
                 >

app_Web/packages/ibiz-vue/src/components/common/context-menu-drag/context-menu-drag.vue

@@ -9,24 +9,24 @@
         v-model="leftDrawerVisiable"
     >
         <div class="context-menu-drag">
-            <div class="menu-list">
-                <div class="menu-header">
-                    <div class="menuicon">
+            <div class="context-menu__list">
+                <div class="context-menu__list__header">
+                    <div class="header__menuicon">
                         <Icon type="md-apps" />
                     </div>
-                    <div class="content">
+                    <div class="header__content">
                         <span>{{ $t('components.contextmenudrag.allapp') }}</span>
                     </div>
-                    <div class="forward">
+                    <div class="header__forward">
                         <Icon type="ios-arrow-forward" />
                     </div>
                 </div>
-                <div class="menu-content">
-                    <div @click="skipTo(item)" class="menu-content-item" v-for="item in list" :key="item.id">
+                <div class="context-menu__list__content">
+                    <div @click="skipTo(item)" class="content__item" v-for="item in list" :key="item.id">
                         <span class="icon">
                             <Icon type="ios-star" />
                         </span>
-                        <span class="title">{{ item.fullName ? item.fullName : item.label }}</span>
+                        <span class="caption">{{ item.fullName ? item.fullName : item.label }}</span>
                     </div>
                 </div>
             </div>

app_Web/packages/ibiz-vue/src/components/common/studio-view/studio-view-base.tsx

@@ -126,8 +126,8 @@ export class StudioViewBase extends Vue {
             this.$slots.topMessage ? this.$slots.topMessage : null,
             this.isShowHeader ? (
                 <div class="view-header" key="view-header">
-                    {this.$slots.title ? <div class="title">{this.$slots.title}</div> : null}
-                    {this.$slots.toolbar ? <div class="toolbar">{this.$slots.toolbar}</div> : null}
+                    {this.$slots.title ? <div class="view-header__title">{this.$slots.title}</div> : null}
+                    {this.$slots.toolbar ? <div class="view-header__toolbar">{this.$slots.toolbar}</div> : null}
                     {this.$slots.quickGroupSearch ? (
                         <div class="quick-group-search">{this.$slots.quickGroupSearch}</div>
                     ) : null}

app_Web/packages/ibiz-vue/src/components/common/text-file-upload/text-file-upload.vue

 <template>
     <div class="file-upload">
         <el-row v-for="(item,index) in uploadFileList" :key="index">
-            <el-col class="fileMain">
+            <el-col class="file-upload__contnet">
                 <i class="el-icon-document"></i>
                 <span>{{item.name}}</span>
                 <el-link class="filePreview" v-show="showPreview" type="warning" @click="onPreview(item)">
@@ -14,16 +14,16 @@
                     {{$t('components.diskFileUpload.delete')}}
                 </el-link>
             </el-col>
-            <el-col class="fileDisable" v-if="!showEdit && !showPreview && !showDelete">
+            <el-col class="file-upload__disable" v-if="!showEdit && !showPreview && !showDelete">
                 <i class="el-icon-document-delete"></i>
                 <span>{{item.name}}</span>
             </el-col>
         </el-row>
-        <div class="fileAdd" @click="uploadFile" v-show="uploadFileList.length < maxLength">
+        <div class="file-upload__add" @click="uploadFile" v-show="uploadFileList.length < maxLength">
             <i class="el-icon-plus"></i>
         </div>
          <el-upload
-            class="upload"
+            class="file-upload__upload"
             ref="upload"
             :headers="headers"
             :action="getAction()"
@@ -33,7 +33,7 @@
             <el-button>{{$t('components.uploadfile.choose')}}</el-button>
         </el-upload>
         <!-- 自定义弹框 -->
-        <div class="dialogDiv">
+        <div class="file-upload__dialog">
             <el-dialog
                     title="请选择模板"
                     center

app_Web/packages/ibiz-vue/src/components/common/upload-file/upload-file.vue

@@ -19,9 +19,13 @@
           :on-format-error="formaterror"
           :on-exceeded-size="exceededsize" 
           :on-progress="progress">
-            <div class="upload-text">
+            <div class="upload-file__text">
                 <p>{{$t('components.uploadfile.imgmsg')}}</p>
-                <p><span class="text-style">{{$t('components.uploadfile.localupload')}}</span>{{$t('components.uploadfile.or')}}<span class="text-style">{{$t('components.uploadfile.imgmsg1')}}</span></p>
+                <p>
+                    <span class="upload-file__text-style">{{$t('components.uploadfile.localupload')}}</span>
+                    {{$t('components.uploadfile.or')}}
+                    <span class="upload-file__text-style">{{$t('components.uploadfile.imgmsg1')}}</span>
+                </p>
             </div>
         </upload>
     </div>

app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-dataview-base.tsx

@@ -196,11 +196,21 @@ export class AppDataViewBase extends DataViewControlBase {
             width: this.controlInstance.cardWidth > 0 ? `${this.controlInstance.cardWidth}px` : false,
             height: this.controlInstance.cardHeight > 0 ? `${this.controlInstance.cardHeight}px` : false
         };
+        const itemCssName = {
+            "app-control-dataview__content__item": true,
+            "is-active": item.srfchecked === 1
+        }
+        const itemCss = this.controlInstance.getItemPSSysCss();
+        if (itemCss) {
+            Object.assign(itemCssName, {
+                [itemCss.cssName] : true,
+            })
+        }
         return (
             <el-card
                 shadow="hover"
                 body-style={style}
-                class={{ "app-control-dataview__content__item": true, "is-active": item.srfchecked === 1}}
+                class={itemCssName}
                 nativeOnClick={() => throttle(this.handleClick, [item], this)}
                 nativeOnDblclick={() => throttle(this.handleDblClick, [item], this)}>
                 {this.controlInstance.getItemPSLayoutPanel()

app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-list-base.tsx

@@ -162,10 +162,20 @@ export class AppListBase extends ListControlBase {
      * @memberof AppListBase
      */
     public renderDefaultItem(item: any, index: number) {
+        const itemCssName = {
+            "app-control-list__content__item": true,
+            "is-active": item.srfchecked === 1
+        }
+        const itemCss = (this.controlInstance as any).M.getItemPSSysCss;
+        if (itemCss) {
+            Object.assign(itemCssName, {
+                [itemCss.cssName] : true,
+            })
+        }
         return (
             <div
                 key={index}
-                class={{ "app-control-list__content__item": true, "is-active": item.srfchecked === 1}}
+                class={itemCssName}
                 on-click={() => throttle(this.handleClick, [item], this)}
                 on-dblclick={() => throttle(this.handleDblClick, [item], this)}>
                 {this.controlInstance.getItemPSLayoutPanel() ? this.renderItemPSLayoutPanel(item) : this.renderListItemContent(item, index)}

app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-searchform-base.tsx

@@ -5,7 +5,7 @@ import {
     throttle,
 } from 'ibiz-core';
 import { SearchFormControlBase } from '../../../widgets';
-import { IPSAppDEUIAction, IPSDEFormButton, IPSDEFormDetail, IPSDEFormDRUIPart, IPSDEFormFormPart, IPSDEFormGroupPanel, IPSDEFormIFrame, IPSDEFormPage, IPSDEFormRawItem, IPSDEFormTabPage, IPSDEFormTabPanel, IPSDESearchFormItem, IPSEditor, IPSFlexLayout, IPSFlexLayoutPos, IPSGridLayoutPos, IPSLayout, IPSLanguageRes } from '@ibiz/dynamic-model-api';
+import { IPSDEFormButton, IPSDEFormDetail, IPSDEFormDRUIPart, IPSDEFormFormPart, IPSDEFormGroupPanel, IPSDEFormIFrame, IPSDEFormPage, IPSDEFormRawItem, IPSDEFormTabPage, IPSDEFormTabPanel, IPSDESearchFormItem, IPSEditor, IPSFlexLayout, IPSFlexLayoutPos, IPSGridLayoutPos, IPSLayout } from '@ibiz/dynamic-model-api';
 
 /**
  * 搜索表单部件基类
@@ -704,10 +704,12 @@ export class AppSearchFormBase extends SearchFormControlBase {
                 on-on-valuidate={this.formItemValidate.bind(this)}
                 nativeOnkeyup={this.onKeyUp.bind(this)}
             >   
-                <row class="control-content app-control-searchform__content" style={this.getColStyle()}>
+                <div class="control-content app-control-searchform__content">
+                    <row class="app-control-searchform__left" style={this.getColStyle()}>
                         {this.renderFormContent()}
                     </row>
                     {this.renderSearchButton(searchButtonStyle)}
+                </div>
             </i-form>
         );
     }

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

 .action-timeline-table {
     width: calc(100% - 60px);
     margin: 0 30px;
-    border-collapse:separate;
-    border-spacing:0px 40px;
+    border-collapse: separate;
+    border-spacing: 0px 40px;
+
     .action-timeline-thead {
         th:nth-child(1) {
             min-width: 200px;
         }
+
         th:nth-child(2) {
             width: 100%
         }
     }
-    .action-timeline-tbody {
-        tr {
+}
+
+.action-timeline-tbody {
     td {
         position: relative;
-                > .tbody__date {
+
+        >.tbody__date {
             display: flex;
             width: 200px;
             display: flex;
@@ -24,10 +28,12 @@
             background-color: #f5f5f5;
             border-radius: 8px;
             font-size: 16px;
+
             .arrow {
                 margin-left: 10px;
             }
         }
+
         >.tbody__date::before {
             content: ' ';
             display: block;
@@ -36,15 +42,20 @@
             top: 30px;
             height: 2px;
             width: 20px;
-                    // background-color: @color-dark-tint;
+            background-color: black;
         }
-                >.tbody__timeline {
+    }
+}
+
+>.tbody__timeline {
     padding: 16px;
     min-height: 68px;
     margin-left: 18px;
     background-color: #f5f5f5;
     border-radius: 8px;
-                    .action-timeline-wrapper {
+}
+
+.action-timeline-wrapper {
     padding-left: 165px;
     color: #57A3FD;
 
@@ -54,6 +65,7 @@
         display: list-item;
         list-style: none;
         top: -6px;
+
         >.action-timeline-item__time {
             position: absolute;
             left: -115px;
@@ -67,21 +79,20 @@
         }
     }
 
-                        >.action-timeline-item::before {
+    .action-timeline-item::before {
         position: absolute;
         top: 17px;
         left: 45px;
         z-index: 3;
         width: 7px;
         height: 7px;
-                            // background-color: @color-dark-base;
-                            // border: 1px solid @color-dark-base;
-                            border: 1px solid ;
+        background-color: black;
+        border: 1px solid black;
         content: ' ';
         border-radius: 50%;
     }
 
-                        >.action-timeline-item:nth-child(n+2)::after {
+    .action-timeline-item:nth-child(n+2)::after {
         position: absolute;
         top: -7px;
         bottom: 12px;
@@ -89,12 +100,6 @@
         z-index: 1;
         display: block;
         content: ' ';
-                            // border-left: 1px solid @color-dark-base;
-                            border-left: 1px solid ;
-                        }
-                    }
-                }
-            }
-        }
+        border-left: 1px solid black;
     }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/common/app-content-bottom-exp-view-layout.less

-.app-content-bottom-exp {
-    > .ivu-tabs {
-        > .ivu-tabs-content {
-            > .ivu-tabs-tabpane {
-                > .tab-exp-item-content {
-                    > .studio-view.view-container {
+    .tab-exp-item-content {
+        >.studio-view.view-container {
             position: unset;
 
-                        > .view-header {
+            .view-header {
                 position: absolute;
                 top: 0px;
                 right: 30px;
@@ -14,52 +10,42 @@
                 width: auto;
                 height: 30px;
                 border: 0px;
-
-                            > .title {
-                                display: none;
             }
 
-                            > .toolbar {
-                                font-size: 12px;
-
-                                > .toolbar-container {
-                                    > .ivu-btn.ivu-btn-default {
-                                        font-size: 12px;
-                                        background-color: transparent;
-                                        border: 0px;
+            .title {
+                display: none;
             }
 
-                                    > .ivu-btn.ivu-btn-default:disabled {
-                                        // color: var(--view-button-background-color-disabled);
-                                    }
+            .view-content {
+                height: 100%;
             }
         }
 
-                            > .quick-search {
+        .quick-search {
             width: 230px;
 
-                                > .ivu-input-wrapper.ivu-input-wrapper-default.ivu-input-type-text {
-                                    > .ivu-input.ivu-input-default.ivu-input-with-suffix {
+            .ivu-input.ivu-input-default.ivu-input-with-suffix {
                 height: 24px;
                 line-height: 24px;
                 background-color: transparent;
             }
 
-                                    > .ivu-input-icon {
+            .ivu-input-icon {
                 width: 24px;
                 height: 24px;
                 line-height: 24px;
             }
         }
-                            }
-                        }
 
-                        > .view-content {
-                            height: 100%;
-                        }
-                    }
+        .toolbar {
+            font-size: 12px;
         }
+
+        .toolbar-container {
+            >.ivu-btn.ivu-btn-default {
+                font-size: 12px;
+                background-color: transparent;
+                border: 0px;
             }
         }
     }
\ No newline at end of file
-}

app_Web/packages/ibiz-vue/src/styles/components/common/app-content-bottom-exp.less

@@ -2,38 +2,35 @@
     width: 100%;
     height: 100%;
 
-    > .ivu-tabs.ivu-tabs-mini {
-        > .ivu-tabs-bar {
-            > .ivu-tabs-nav-container {
-                > .ivu-tabs-nav-wrap {
+    >.ivu-tabs.ivu-tabs-mini {
+        .ivu-tabs-nav-wrap {
             height: 30px;
         }
     }
-        }
 
     .tab-exp-title {
-            > i,
+
+        >i,
         img {
             padding-right: 3px;
         }
     }
 
-        > .ivu-tabs-content {
+    >.ivu-tabs-content {
         width: 100%;
         height: calc(100% - 29px);
         padding: 0px;
 
-            > .ivu-tabs-tabpane {
+        >.ivu-tabs-tabpane {
             width: 100%;
             height: 100%;
         }
     }
-        > .tab-exp-item-content {
+
+    >.tab-exp-item-content {
         width: 100%;
         height: 100%;
         overflow-x: hidden;
         overflow-y: auto;
     }
-    }
-    
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/common/app-content-left-exp.less

@@ -2,10 +2,11 @@
     height: 100%;
     display: flex;
 
-    > .exp-actions {
+    >.exp-actions {
         height: 100%;
         width: 48px;
-        > .action-item {
+
+        >.action-item {
             position: relative;
             height: 48px;
             width: 48px;
@@ -14,8 +15,9 @@
             align-items: center;
             justify-content: center;
             cursor: pointer;
+        }
 
-            > .active-item-indicator {
+        .active-item-indicator {
             position: absolute;
             z-index: 1;
             top: 0;
@@ -29,8 +31,8 @@
         }
     }
 
-        > .action-item.active {
-            > .active-item-indicator::before {
+    .action-item.active {
+        >.active-item-indicator::before {
             content: '';
             position: absolute;
             z-index: 1;
@@ -41,26 +43,27 @@
             border-left: 2px solid;
         }
     }
-    }
 
-    > .exp-content {
+    >.exp-content {
         width: 100%;
         height: 100%;
         overflow: hidden;
 
-        > .exp-item {
+        >.exp-item {
             width: 100%;
             height: 100%;
             overflow-x: hidden;
             overflow-y: auto;
-            .ivu-card-body{
-                height: calc(100% - 57px) ;
         }
+
+        .ivu-card-body {
+            height: calc(100% - 57px);
+        }
+
         .view-header {
-                > .quick-search {
+            >.quick-search {
                 width: 150px;
             }
         }
     }
-    }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/common/app-content-left-nav-menu.less

@@ -17,7 +17,7 @@
   border-radius: 0;
   box-shadow: none;
   border: 0;
-//   background-color: var(--app-background-color-scrollbar);
+//background-color: var(--app-background-color-scrollbar);
 }
 //火狐浏览器滚动条样式
 .app-content-lef-nav-menu {
@@ -35,15 +35,15 @@
       min-height: 100%;
       background-color: #ddd;
       border: 0;
-
+  }
   .el-menu-item,
-      .el-submenu > .el-submenu__title {
+  .el-submenu__title {
       min-width: calc(100% - 10px);
       height: 38px;
       line-height: 38px;
       font-size: 18px;
-          padding-left: 10px !important;
-          padding-right: 0px !important;
+      padding-left: 10px;
+      padding-right: 0px;
 
       > i {
           margin-right: 5px;
@@ -65,7 +65,6 @@
           padding-left: 10px;
       }
   }
-  }
 
   > .el-menu:not(.el-menu--collapse) {
       width: 200px;
@@ -74,27 +73,28 @@
   .el-menu.el-menu--collapse {
       width: 48px;
 
-      > .el-submenu > .el-submenu__title,
+      .el-submenu__title,
       > .el-menu-item,
-      > .el-menu-item > .el-tooltip {
-          padding: 0 !important;
+      .el-tooltip {
+          padding: 0 ;
           text-align: center;
           width: 48px;
           min-width: 48px;
 
           > i {
-              margin: 0 !important;
-              // color: #616161;
+              margin: 0;
+              color: #616161;
           }
       }
   }
 }
 
 // 菜单收起后漂浮菜单样式
-// .el-menu--vertical {
-//     .el-menu {
-//         .app-content-lef-nav-menu .el-menu;
-//     }
+.el-menu--vertical {
+    .el-menu {
+        .app-content-lef-nav-menu .el-menu;
+    }
+  }
 //     > .el-menu,
 //     > .ivu-layout > .ivu-layout-sider .app-app-menu > .app-menu {
 //         // background-color: var(--leftsidebar-background-color);
@@ -109,67 +109,67 @@
 //                 // color: var(--leftsidebar-font-color-bright);
 //             }
 //         }
-        // .el-submenu__title:hover {
-        //     // background-color: var(--leftsidebar-background-color-bright);
-        //     i {
-        //         // color: var(--leftsidebar-font-color);
-        //     }
-        //     span {
-        //         // color: var(--leftsidebar-font-color-bright);
-        //     }
-        // }
-        // .el-submenu.is-active {
-        //     // background-color: var(--leftsidebar-background-color-bright);
-        //     >.el-submenu__title {
-        //         i {
-        //             color: var(--leftsidebar-font-color);
-        //         }
-        //         span{
-        //             color: var(--leftsidebar-font-color);
-        //         }
-        //     }
-        // }
-        // .el-menu-item.is-active {
-        //     background-color: var(--leftsidebar-background-color-bright);
-        //     i {
-        //         color: var(--leftsidebar-font-color-bright);
-        //     }
-        //     span {
-        //         color: var(--leftsidebar-font-color-bright);
-        //     }
-        // }
-        // .el-submenu.is-opened,
-        // .el-submenu:hover {
-        //     > .el-submenu__title {
-        //         background: var(--leftsidebar-background-color-bright);
-        //     }
-        // }
-        // .el-submenu__title,
-        // .el-menu-item {
-        //     i {
-        //         color: var(--leftsidebar-font-color);
-        //     }
-        //     span {
-        //         color: var(--leftsidebar-font-color);
-        //     }
-        // }
-        // .el-menu-item {
-        //     i {
-        //         color: var(--leftsidebar-font-color);
-        //     }
-        //     span {
-        //         color: var(--leftsidebar-font-color);
-        //     }
-        //     border-top: 1px solid var(--leftsidebar-background-color);
-        //     background: var(--leftsidebar-background-color);
-        // }
-        // .el-submenu {
-        //     border-top: 1px solid var(--leftsidebar-background-color);
-        //     background: var(--leftsidebar-background-color);
-        //     > .el-menu {
-        //         border-top: 1px solid var(--leftsidebar-background-color);
-        //         background: var(---leftsidebar-background-color);
-        //     }
-        // }
+//         .el-submenu__title:hover {
+//             // background-color: var(--leftsidebar-background-color-bright);
+//             i {
+//                 // color: var(--leftsidebar-font-color);
+//             }
+//             span {
+//                 // color: var(--leftsidebar-font-color-bright);
+//             }
+//         }
+//         .el-submenu.is-active {
+//             // background-color: var(--leftsidebar-background-color-bright);
+//             >.el-submenu__title {
+//                 i {
+//                     color: var(--leftsidebar-font-color);
+//                 }
+//                 span{
+//                     color: var(--leftsidebar-font-color);
+//                 }
+//             }
+//         }
+//         .el-menu-item.is-active {
+//             background-color: var(--leftsidebar-background-color-bright);
+//             i {
+//                 color: var(--leftsidebar-font-color-bright);
+//             }
+//             span {
+//                 color: var(--leftsidebar-font-color-bright);
+//             }
+//         }
+//         .el-submenu.is-opened,
+//         .el-submenu:hover {
+//             > .el-submenu__title {
+//                 background: var(--leftsidebar-background-color-bright);
+//             }
+//         }
+//         .el-submenu__title,
+//         .el-menu-item {
+//             i {
+//                 color: var(--leftsidebar-font-color);
+//             }
+//             span {
+//                 color: var(--leftsidebar-font-color);
+//             }
+//         }
+//         .el-menu-item {
+//             i {
+//                 color: var(--leftsidebar-font-color);
+//             }
+//             span {
+//                 color: var(--leftsidebar-font-color);
+//             }
+//             border-top: 1px solid var(--leftsidebar-background-color);
+//             background: var(--leftsidebar-background-color);
+//         }
+//         .el-submenu {
+//             border-top: 1px solid var(--leftsidebar-background-color);
+//             background: var(--leftsidebar-background-color);
+//             > .el-menu {
+//                 border-top: 1px solid var(--leftsidebar-background-color);
+//                 background: var(---leftsidebar-background-color);
+//             }
+//         }
 //     }
 // }

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

@@ -8,8 +8,7 @@
     }
 }
 .app-content-right.hidden-bottom {
-    > .ivu-split-wrapper {
-        > .ivu-split-vertical {
+    .ivu-split-vertical {
         > .top-pane.ivu-split-pane {
             bottom: 0px ;
         }
@@ -22,7 +21,6 @@
             display: none;
         }
     }
-    }
 }
 .ivu-split-wrapper.app-content-split.hidden-left {
     > .ivu-split-horizontal {

app_Web/packages/ibiz-vue/src/styles/components/common/app-department-personnel.less

@@ -3,6 +3,7 @@
     .ivu-select-selection{
         position: relative;
         padding: 0;
+    }
     .ivu-select-selected-value{
         padding-left: 15px;
         font-size: 13px;
@@ -32,10 +33,6 @@
         position: absolute;
         left: -1px;
     }
-        &.ivu-select-selection-focused{
-            .editor-border-active;
-        }
-    }
     .el-icon-search{
         position: absolute;
         top: 10px;

app_Web/packages/ibiz-vue/src/styles/components/common/app-department-select.less

 .app-department-select {
-  .ivu-dropdown {
-    .ivu-dropdown-rel {
-      .tree-input {
   .ivu-input-suffix {
     width: auto;
     text-align: right;
@@ -14,14 +11,12 @@
   .el-icon-circle-close {
     display: none;
   }
-      }
 
   .tree-input:hover {
     .el-icon-circle-close {
       display: inline-block;
     }
   }
-    }
 
   .ivu-select-dropdown {
     max-height: 200px;
@@ -31,7 +26,6 @@
       overflow: inherit;
     }
   }
-  }
 
   .el-input__inner {
     height: 32px;

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

@@ -15,8 +15,12 @@
             cursor: pointer;
             padding: 0px 6px;
             font-size: 14px;
-
-            > .action-item {
+            &:hover {
+                background: hsla(0, 0%, 100%, 0.12);
+            }
+        }
+    }
+    .action-item {
         height: 100%;
         display: flex;
         align-items: center;
@@ -26,12 +30,6 @@
             padding-right: 3px;
         }
     }
-        }
-
-        > .item:hover {
-            background: hsla(0, 0%, 100%, 0.12);
-        }
-    }
 
     > .app-footer-right {
         flex-direction: row-reverse;

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

@@ -28,6 +28,9 @@
             pointer-events: none;
         }
     }
+    .app-form-group__action__showmore {
+        margin-left: 12px;
+    }
     &.is-flex {
         height: 100%;
         overflow-y: auto;

app_Web/packages/ibiz-vue/src/styles/components/common/app-group-select.less

@@ -9,6 +9,7 @@
         flex-grow: 1;
         min-height: 32px;
         height: auto;
+    }
     .app-group-select__content__text{
         padding-left: 15px;
         font-size: 13px;
@@ -31,7 +32,6 @@
             cursor: pointer;
         }
     }
-    }
     .app-group-select__open {
         display: flex;
         text-align: center;

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

@@ -17,19 +17,15 @@
             background: hsla(0, 0%, 100%, 0.12);
             border-bottom: none;
         }
-
-        > .ivu-menu-submenu {
-            > .ivu-menu-submenu-title {
-                > .ivu-icon.ivu-icon-ios-arrow-down.ivu-menu-submenu-title-icon {
+        .ivu-icon.ivu-icon-ios-arrow-down.ivu-menu-submenu-title-icon {
             margin-right: 0px;
         }
-            }
 
-            > .ivu-select-dropdown {
+        .ivu-select-dropdown {
                 max-height: 350px;
                 overflow-x: hidden;
                 overflow-y: auto;
-
+        }
         > .ivu-menu-drop-list {
             > .ivu-menu-item,
             > .ivu-menu-submenu {
@@ -44,8 +40,6 @@
             }
         }
     }
-        }
-    }
 
     > .ivu-menu.ivu-menu-horizontal::after {
         content: none;

app_Web/packages/ibiz-vue/src/styles/components/common/app-markdown-editor.less

 .app-mavon-editor {
     border-width: 0 ;
     .v-note-panel {
-        .v-show-content {
-            table {
-                tr {
         td, th {
             border-color: #666 ;
         }
-                }
-            }
         pre, .highlight pre {
             color: #333;
         }
         h1, h2, h3, h4, h5, h6 {
             border-color: #666;
         }
-        }
         .v-show-content-html {
             border-left: 1px solid #666;
         }
     }
     .v-note-op {
         border-width: 0 ;
+    }
     .v-left-item {
         .op-icon-divider {
             border-color: #666;
         }
     }
-    }
     .op-icon.dropdown-wrapper.dropdown .popup-dropdown {
         .dropdown-item:hover {
             background: transparent;

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

@@ -4,7 +4,8 @@
     right: 0;
     bottom: 0;
     left: 0;
-    > .debug-container {
+
+    >.debug-container {
         display: inline-block;
         width: auto;
         position: absolute;
@@ -13,15 +14,19 @@
         z-index: 10;
     }
 }
+
 .app-studioaction {
     z-index: 10;
+
     .ivu-poptip-inner {
         background-color: rgba(96, 98, 102, 0.8);
         border-radius: 5px;
     }
+
     .ivu-poptip-arrow {
         display: none;
     }
+
     .ivu-poptip-body {
         padding: 0px;
     }
@@ -44,6 +49,7 @@
         }
     }
 }
+
 .app-studio-debug-bar {
     border-radius: 5px;
     background-color: rgba(96, 98, 102, 0.8);
@@ -69,10 +75,12 @@
         z-index: 1;
         padding-left: 6px;
         padding: 3px 6px;
-        > .ivu-btn {
+
+        >.ivu-btn {
             margin: 0;
         }
     }
+
     .drag-handle {
         position: absolute;
         width: 100%;
@@ -83,7 +91,8 @@
             border-left: 1px solid #bbb;
             height: 34px;
             padding: 0px 3px;
-            > svg {
+
+            >svg {
                 margin-top: 8px;
             }
         }
@@ -100,23 +109,18 @@
     border: 3px solid paleturquoise;
     z-index: 1;
 }
+
 .app-studio-debug-detail-wrapper {
-    .app-studio-debug-detail {
-        color: #fff;
-        width: 300px;
-        z-index: 10;
-        padding: 4px 8px;
-        border-radius: 5px;
-        right: calc(100% + 10px);
-        top: 0;
     .detail-item-title {
         font-size: 16px;
         height: 32px;
         line-height: 32px;
         margin-bottom: 6px;
         border-bottom: 1px solid #ccc;
+
         .tag {
             cursor: pointer;
+
             &.isfold {
                 .ivu-icon {
                     transform: rotate(180deg);
@@ -124,24 +128,40 @@
             }
         }
     }
+
+    .app-studio-debug-detail {
+        color: #fff;
+        width: 300px;
+        z-index: 10;
+        padding: 4px 8px;
+        border-radius: 5px;
+        right: calc(100% + 10px);
+        top: 0;
+    }
+
     .detail-item-wrapper {
         transition: all 1s;
         height: auto;
+
         &.isfold {
             height: 0;
             overflow: hidden;
         }
+
         .detail-item {
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
+
             .value,
             .key {
                 cursor: pointer;
+
                 &:hover {
                     color: rgb(219, 230, 255);
                 }
             }
+
             .key-wrapper {
                 width: 110px;
                 height: 26px;
@@ -152,6 +172,7 @@
                 overflow: hidden;
                 text-align: end;
             }
+
             .value-wrapper {
                 width: calc(100% - 110px);
                 height: 26px;
@@ -163,11 +184,18 @@
             }
         }
     }
-    }
+}
+
+.isblock {
+    display: block;
+}
+
+.isnone {
+    display: none;
 }
 
 .view-container {
-    > .view-container {
+    >.view-container {
         .app-studio-debug-bar {
             top: 50px;
         }

app_Web/packages/ibiz-vue/src/styles/components/common/context-menu-drag.less

 .sider-drawer {
-  // .ivu-drawer {
-  //   background-color: var(--app-color-primary-contrast) !important;
-  // }
-
   .ivu-drawer-body {
-    padding: 0px !important;
+    padding: 0px;
   }
 
   .context-menu-drag {
@@ -14,20 +10,19 @@
       transition: transform 0.3s;
     }
 
-    .menu-list {
+    .context-menu__list {
       width: 100%;
       height: 100%;
 
-      .menu-header {
+      .context-menu__list__header {
         cursor: pointer;
-        // border-bottom: 1px solid var(--item-font-color-bright);
         border-bottom: 1px solid ;
         height: 48px;
         line-height: 48px;
         display: flex;
         align-items: center;
 
-        .menuicon {
+        .header__menuicon {
           display: inline-block;
           width: 50px;
           font-size: 16px;
@@ -35,7 +30,7 @@
           font-size: 22px;
         }
 
-        .content {
+        .header__content {
           display: inline-block;
           text-overflow: ellipsis;
           white-space: nowrap;
@@ -44,17 +39,16 @@
           font-size: 13px;
         }
 
-        .forward {
+        .header__forward {
           margin: 0px 8px 0px 4px;
-          // color: var(--item-font-color-bright);
           font-size: 15px;
         }
       }
 
-      .menu-content {
+      .context-menu__list__content {
         padding: 8px 0px;
 
-        .menu-content-item {
+        .content__item {
           display: flex;
           align-items: center;
           height: 36px;
@@ -66,7 +60,7 @@
             line-height: 36px;
           }
 
-          .title {
+          .caption {
             font-size: 16px;
             display: inline-block;
             margin-left: 8px;
@@ -74,7 +68,7 @@
           }
         }
 
-        .menu-content-item:hover {
+        .content__item:hover {
           color: #2d8df3;
         }
       }
@@ -84,12 +78,12 @@
 
 .style-top {
   .ivu-drawer {
-    top: 41px !important;
+    top: 41px ;
   }
 }
 
 .default-top {
   .ivu-drawer {
-    top: 50px !important;
+    top: 50px;
   }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/common/context-menu.less

@@ -3,11 +3,11 @@
 
   .context-menu-content {
     position: absolute;
-      // background: var(--item-background-color-bright);
 
     .ivu-divider {
       width: 100%;
     }
+
     &.context-menus-bottom {
       .ivu-select-dropdown {
         transform: translateY(-100%);
@@ -22,7 +22,6 @@
       padding: 0 13px;
       margin: 0;
       font-size: 14px;
-          // color: var(--item-font-color-light);
       cursor: pointer;
       outline: none;
       display: flex;
@@ -36,11 +35,6 @@
         margin-right: 8px;
       }
     }
-
-      // .context-menus-item:hover {
-      //     background-color: var(--item-background-color-hover);
-      //     color: var(--item-font-color-light);
-      // }
   }
 }
 

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

-.action-timeline{
+.extend-action-timeline {
     height: 100%;
     overflow: scroll;
-  .extend-action-timeline-table {
+}
+
+.extend-action-timeline-table {
     border-collapse: separate;
     border-spacing: 0px 40px;
 
-      .action-timeline-thead {
+    .extend-action-timeline-thead {
         th:nth-child(1) {
             min-width: 200px;
         }
@@ -14,15 +16,9 @@
             width: 100%;
         }
     }
+}
 
-      .action-timeline-body {
-          width: 100%;
-  
-          .timeline-content .authorname {
-              color: #57a3fd;
-          }
-  
-          .timeline.timeline-head {
+.extend-action-timeline-body__timeline.timeline-head {
     padding: 8px 16px;
     height: 45px;
     line-height: 45px;
@@ -36,24 +32,80 @@
     .type {
         padding-left: 16px;
     }
+}
+
+.extend-action-timeline-body {
+    width: 100%;
+
+    .timeline-content .authorname {
+        color: #57a3fd;
+    }
+
+    .tooltips {
+        width: 214px;
+        display: flex;
+        flex-wrap: wrap;
+
+        .tooltips-content {
+            width: 30%;
+            margin: 5px 15px;
+        }
+    }
+
+    .timeline-draw {
+        height: auto;
+        background-color: #fafafa;
+        border-bottom: 1px solid #e8eaec;
+
+        .timeline-wrapper {
+            height: auto;
+        }
+
+        .timeline-wrapper__timeline-index {
+            width: 60px;
+            height: auto;
+        }
+
+        .timeline-wrapper__usertaskname {
+            width: 100%;
+        }
+
+        .timeline-wrapper__authorname {
+            display: flex;
+            width: 100%;
+            height: auto;
+            flex-wrap: wrap;
+
+            >div {
+                width: 110px;
+            }
+        }
     }
+}
+
+.extend-action-timeline-body__timeline {
+    position: relative;
+    width: 100%;
+    padding: 0 16px;
+    height: 65px;
+    line-height: 65px;
+    font-size: 14px;
 
-          .timeline {
     .timeline-wrapper {
         display: flex;
         width: 100%;
 
-                  .usertaskname,
-                  .authorname,
-                  .last-time,
-                  .type,
-                  .fullmessage {
+        .timeline-wrapper__usertaskname,
+        .timeline-wrapper__authorname,
+        .timeline-wrapper__last-time,
+        .timeline-wrapper__type,
+        .timeline-wrapper__fullmessage {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
         }
 
-                  .tootip .el-popover__reference{
+        .timeline-wrapper__tootip .el-popover__reference {
             max-width: 500px;
             overflow: hidden;
             white-space: nowrap;
@@ -65,7 +117,7 @@
             margin: 0 5px;
         }
 
-                  .type {
+        .timeline-wrapper__type {
             width: 9%;
             min-width: 180px;
             text-align: start;
@@ -82,14 +134,7 @@
         }
     }
 
-              position: relative;
-              width: 100%;
-              padding: 0 16px;
-              height: 65px;
-              line-height: 65px;
-              font-size: 14px;
-  
-              .timeline-index {
+    .timeline-wrapper__timeline-index {
         width: 50px;
         height: 65px;
         position: relative;
@@ -148,22 +193,22 @@
         text-overflow: ellipsis;
     }
 
-              .usertaskname {
+    .timeline-wrapper__usertaskname {
         width: 9%;
         min-width: 160px;
     }
 
-              .authorname {
+    .timeline-wrapper__authorname {
         width: 15%;
         min-width: 110px;
     }
 
-              .last-time {
+    .timeline-wrapper__last-time {
         width: 15%;
         min-width: 100px;
     }
 
-              .arrow {
+    .timeline__arrow {
         position: absolute;
         right: 24px;
         bottom: 50%;
@@ -176,23 +221,4 @@
         font-weight: bold;
         color: #999;
     }
-          }
-  
-          .tooltips {
-              width: 214px;
-              display: flex;
-              flex-wrap: wrap;
-  
-              .tooltips-content {
-                  width: 30%;
-                  margin: 5px 15px;
-              }
-          }
-  
-          .timeline-draw {
-              background-color: #fafafa;
-              border-bottom: 1px solid #e8eaec;
-          }
-      }
-  }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/common/studio-view-style2-layout.less

@@ -3,11 +3,14 @@
         flex-shrink: 0;
         min-height: 36px;
     }
-
     .app-search-form.ivu-form {
+        .app-form-item.label-top {
+            margin: 0;
+        }
+        
+    }
     .search-button {
         width: 236px;
-
         .ivu-btn {
             float: right;
             margin-left: 10px;
@@ -15,42 +18,25 @@
             // color: var(--view-button-background-color);
         }
     }
-
-        .form-content {
-            width: 236px;
-
-            .app-form-item.label-top {
-                margin: 0;
-            }
-
-            .app-form-item {
     .app-form-item-label {
         height: 26px;
         line-height: 26px;
     }
-
-                .editor-wrapper {
-                    .ivu-input-wrapper {
+    .form-content {
+        width: 236px;
         .ivu-input {
             height: 26px;
             line-height: 26px;
         }
-                    }
-
-                    .ivu-select {
         .ivu-select-selection {
             height: 26px;
-
+        }
         .ivu-select-placeholder {
             height: 26px;
             line-height: 26px;
         }
     }
-                    }
-                }
-            }
-        }
-    }
+    
 }
 
 // .app-portal-view.studio-view.view-container.mode-style2 {

app_Web/packages/ibiz-vue/src/styles/components/common/studio-view-style2.less

@@ -63,11 +63,10 @@
         > .title {
             font-size: 20px;
             height: 50px;
-
+        }
         .caption-image {
             margin-right: 6px;
         }
-        }
 
         > .data-panel {
             float: right;
@@ -81,7 +80,6 @@
     .view-header.hidden-top {
         // border-bottom: 1px solid var(--app-dividing-line-color-bright);
 
-        .quick-search {
         .ivu-input.ivu-input-default.ivu-input-with-suffix {
             height: 28px;
             line-height: 28px;
@@ -93,7 +91,6 @@
             line-height: 28px;
         }
     }
-    }
 
     // .quick-group-tab {
     //     border-bottom: 1px solid var(--app-dividing-line-color-bright);
@@ -114,19 +111,17 @@
             overflow-y: auto;
             overflow-x: hidden;
 
+        }
         .app-search-form {
             display: block;
             width: 250px;
             height: 100%;
             // border-right: 1px solid var(--app-dividing-line-color-bright);
-
-                .ivu-select-input,
-                .el-input .el-input__inner {
+        }
+        .ivu-select-input,.el-input .el-input__inner {
                 height: 26px;
                 line-height: 26px;
             }
-            }
-        }
 
         > .content-wrapper {
             flex-grow: 1;

app_Web/packages/ibiz-vue/src/styles/components/common/studio-view.less

@@ -4,25 +4,6 @@
     position: relative;
     height: 100%;
     width: 100%;
-    // background: var(--view-background-color);
-
-    .app-search-form {
-        padding: 4px 0px 4px 7px;
-        display: flex;
-        flex-direction: row-reverse;
-
-        > .search-button {
-            flex-shrink: 0;
-
-            > .ivu-btn {
-                margin-left: 4px;
-            }
-        }
-
-        > .form-content {
-            flex-grow: 1;
-        }
-    }
 
     .quick-search {
         float: left;
@@ -36,19 +17,8 @@
         .ivu-input.ivu-input-default.ivu-input-with-suffix {
             height: 28px;
             line-height: 28px;
-            // border: 1px solid var(--form-editor-border-color);
-            // color: var(--form-editor-font-color);
-            // background-color: var(--form-editor-background-color);
         }
 
-        // .ivu-input.ivu-input-default.ivu-input-with-suffix:hover {
-        //     border-color: var(--form-editor-active-color);
-        // }
-
-        // .ivu-input.ivu-input-default.ivu-input-with-suffix::-webkit-input-placeholder {
-        //     color: var(--form-editor-placeholder-font-color);
-        // }
-
         .ivu-input-icon {
             width: 28px;
             height: 28px;
@@ -56,23 +26,25 @@
         }
     }
 
-    > .view-header {
-        height: 42px;
-        width: 100%;
-        overflow: hidden;
-        // color: var(--app-font-color);
-        // border-bottom: 1px solid var(--app-background-color-light);
-
-        > .title,
-        > .quick-search,
-        > .toolbar {
-            height: 100%;
+    .app-search-form {
+        padding: 4px 0px 4px 7px;
         display: flex;
-            align-items: center;
-            padding: 0px 0px 0px 3px;
+        flex-direction: row-reverse;
+    
+        >.search-button {
+            flex-shrink: 0;
+    
+            >.ivu-btn {
+                margin-left: 4px;
+            }
+        }
+    
+        >.form-content {
+            flex-grow: 1;
+        }
     }
     
-        > .title {
+    .view-header__title {
         float: left;
         font-size: 14px;
         font-weight: 700;
@@ -83,8 +55,22 @@
         }
     }
     
-        > .quick-group-search,
-        > .quick-search-form {
+    .view-header {
+        height: 42px;
+        width: 100%;
+        overflow: hidden;
+    
+        >.view-header__title,
+        >.quick-search,
+        >.view-header__toolbar {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            padding: 0px 0px 0px 3px;
+        }
+    
+        >.quick-group-search,
+        >.quick-search-form {
             float: left;
             height: 100%;
             margin-left: 8px;
@@ -92,48 +78,46 @@
             align-items: center;
         }
     
-        > .toolbar {
+        >.view-header__toolbar {
             float: right;
         }
     }
     
-    > .view-content {
+    .view-content {
         display: flex;
         flex-direction: column;
         height: calc(100% - 42px);
         width: 100%;
-        padding: 3px 3px 0px 3px !important;
-        // color: var(--view-font-color);
+        padding: 3px 3px 0px 3px;
         overflow-y: auto;
         overflow-x: hidden;
     
-        > .content-wrapper {
+        >.content-wrapper {
             height: 100%;
         }
     }
     
-    > .view-content.show-search-form {
+    .view-content.show-search-form {
         display: flex;
         flex-direction: column;
         overflow: hidden;
     
-        > .search-form-wrapper {
+        >.search-form-wrapper {
             flex-shrink: 0;
         }
     
-        > .search-bar-wrapper {
+        >.search-bar-wrapper {
             flex-shrink: 0;
         }
     
-        > .content-wrapper {
+        >.content-wrapper {
             flex-grow: 1;
             overflow-y: auto;
             overflow-x: hidden;
         }
     }
     
-    > .view-content {
-        > .search-bar-wrapper {
+    .view-content {
         .search-bar-action {
             margin-bottom: 4px;
             text-align: right;
@@ -143,10 +127,9 @@
             }
         }
     }
-    }
-}
     
-.ivu-poptip-popper {
+    
+    .ivu-poptip-popper {
         .save-action {
             margin-top: 4px;
             text-align: right;
@@ -155,35 +138,32 @@
                 margin-left: 4px;
             }
         }
-}
+    }
 
-.studio-view.view-container.hidden-header {
-    > .view-header {
+    &.hidden-header {
+        >.view-header {
             display: none;
         }
     
-    > .view-content {
+        >.view-content {
             height: 100%;
-        padding: 0px !important;
+            padding: 0px;
         }
-}
-
-.studio-view.view-container.hidden-header.show-footer {
-    > .view-content {
+    }
+    &.hidden-header.show-footer {
+        >.view-content {
             height: calc(100% - 46px);
         }
-}
-
-.studio-view.view-container.show-footer {
-    > .view-content {
+    }
+    &.show-footer {
+        >.view-content {
             height: calc(100% - 82px);
         }
     
-    > .view-footer {
+        >.view-footer {
             height: 45px;
             text-align: right;
             padding: 6px 16px;
-        // border-top: 1px solid var(--app-dividing-line-color-bright);
+        }
     }
 }
\ No newline at end of file
-

app_Web/packages/ibiz-vue/src/styles/components/common/text-file-upload.less

@@ -6,8 +6,7 @@
     margin-left: -8px;
     margin-top: -8px;
     color: rgb(67,78,82);
-  .el-row {
-      .el-col{
+    .file-upload__contnet{
           width: 350px;
           height: 50px;
           display: flex;
@@ -16,6 +15,7 @@
           border-radius: 4px;
           margin-left: 8px;
           margin-top: 8px;
+          background: rgb(241,249,234);
           i{
               font-size: 24px;
               margin: 0 8px;
@@ -33,14 +33,10 @@
             right: 90px;
           }
       }
-      .fileMain{
-          background: rgb(241,249,234);
-      }
-      .fileDisable{
+    .file-upload__disable{
         background: rgb(252,240,240);
     }
-  }
-  .fileAdd{
+  .file-upload__add{
       display: flex;
       align-items: center;
       justify-content: center;
@@ -57,9 +53,9 @@
       }
   }
 }
-.upload{
+.file-upload__upload{
 visibility: hidden;
 }
-.dialogDiv .el-dialog {
+.file-upload__dialog .el-dialog {
 height: auto;
 }

app_Web/packages/ibiz-vue/src/styles/components/common/upload-file.less

@@ -7,25 +7,21 @@
         }
         .ivu-upload-drag{
             border-radius: 2px;
-            // border:1px dashed var(--app-color-primary-contrast) !important;
+            
         }
         .ivu-upload-list{
             margin: 0px;
-            // display: none !important;
         }
     }
-    .upload-text{
-        // border:1px dashed var(--item-font-color);
+    .upload-file__text{
         padding:12px 18px;
         text-align: center;
-        // color: var(-item-font-color-bright);
         font-family: -apple-system, "SF UI Text", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Zen Hei", sans-serif;
         font-weight: 400;
         font-size: 12px;
         
     }
-    .text-style{
+    .upload-file__text-style{
         cursor: pointer;
-        // color: var(--item-font-color-active);
     }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/control/app-default-exp-bar.less

@@ -8,6 +8,10 @@
     .flex(row, space-between, center);
   }
 
+  .control-header__left{
+    padding: 0 4px;
+  }
+
   .control-header__left__caption {
     font-size: 14px;
     font-weight: 600;
@@ -22,6 +26,7 @@
     flex-wrap: wrap;
     flex-shrink: 0;
     .flex(row, space-between, center);
+    padding: 0 4px;
   }
 
   .control-header__right__quicksearch {

app_Web/packages/ibiz-vue/src/styles/components/control/app-default-searchform.less

 .app-control-searchform {
-    .flex(row, flex-start, flex-start);
     .app-control-searchform__iframe {
         height: 100%;
         width: 100%;
         border: 0;
     }
+    .app-control-searchform__content {
+        .flex(row, flex-start, flex-start);
+    }
     .app-form-item__content > .ivu-form-item {
         margin-bottom: 8px;
     }
     .app-control-searchform__right {
-        height: 40px;
         width: 100px;
         .flex(row, right, center);
         > .ivu-btn {

app_Web/packages/ibiz-vue/src/styles/objects/view-container.less

@@ -20,7 +20,7 @@
     .flex(row, flex-start, center);
     padding: 0 4px;
     > div{
-        padding: 0 4px;
+        padding-right: 8px;
     }
 }
 
@@ -45,7 +45,7 @@
     .flex(row, flex-end, center);
     padding: 0 4px;
     > div{
-        padding: 0 4px;
+        padding-left: 8px;
     }
 }
 

app_Web/packages/ibiz-vue/src/utils/notice-handler/notice-handler.ts

@@ -140,4 +140,19 @@ export class NoticeHandler {
         AppNoticeService.getInstance().info(beforeArgs.message);
     }
 
+    /**
+     * 消息处理
+     * @param response 
+     * @param callback 
+     * @memberof NoticeHandler
+     */
+    public static message(response: any, callback: Function) {
+        const headers = response.headers;
+        if (headers && headers['x-message']) {
+            AppNoticeService.getInstance().success(decodeURI(headers['x-message']));
+        } else {
+            callback();
+        }
+    }
+
 }
\ No newline at end of file

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

@@ -7,6 +7,7 @@ import moment from 'moment';
 import { AppCenterService, AppViewLogicService, CodeListTranslator } from '../app-service';
 import { IPSAppDEUIAction, IPSDEEditForm, IPSDEEditFormItem, IPSDEFDCatGroupLogic, IPSDEFDLogic, IPSDEFDSingleLogic, IPSDEFIUpdateDetail, IPSDEFormButton, IPSDEFormDetail, IPSDEFormDRUIPart, IPSDEFormGroupPanel, IPSDEFormItem, IPSDEFormItemUpdate, IPSDEFormItemVR, IPSDEFormPage, IPSDEFormTabPage, IPSDEFormTabPanel, IPSUIActionGroupDetail, IPSDEFormItemEx, IPSCodeListEditor } from '@ibiz/dynamic-model-api';
 import { Subscription } from 'rxjs';
+import { NoticeHandler } from '../utils';
 
 /**
  * 编辑表单部件基类
@@ -566,7 +567,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                             this.formState.next({ type: 'save', data: data });
                         });
                         if (this.controlInstance.formFuncMode?.toLowerCase() != 'wizardform' && showResultInfo) {
+                            NoticeHandler.message(response,() =>{
                                 this.$success((data.srfmajortext ? data.srfmajortext : '') + (this.$t(`app.formpage.${actionName}`)) + (this.$t('app.commonwords.success') as string), 'save');
+                            })
                         }
                         resolve(response);
                     });
@@ -624,7 +627,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                             });
                             this.formState.next({ type: 'remove', data: data });
                             this.data.ismodify = false;
+                            NoticeHandler.message(response,() =>{
                                 this.$success((data.srfmajortext ? data.srfmajortext : '') + (this.$t('app.commonwords.deletesuccess') as string), 'remove');
+                            })
                             AppCenterService.notifyMessage({ name: this.controlInstance.getPSAppDataEntity()?.codeName || '', action: 'appRefresh', data: data });
                             resolve(response);
                         });
@@ -734,7 +739,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                                 // 工作流数据刷新
                                 AppCenterService.notifyMessage({ name: 'SysTodo', action: 'appRefresh', data: data });
                                 AppCenterService.notifyMessage({ name: 'WFTask', action: 'appRefresh', data: data });
+                                NoticeHandler.message(response,() =>{
                                     this.$success((this.$t('app.formpage.workflow.startsuccess') as string), 'wfstart');
+                                })
                                 resolve(response);
                             });
                         }).catch((response: any) => {
@@ -830,7 +837,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                             // 工作流数据刷新
                             AppCenterService.notifyMessage({ name: 'SysTodo', action: 'appRefresh', data: data });
                             AppCenterService.notifyMessage({ name: 'WFTask', action: 'appRefresh', data: data });
+                            NoticeHandler.message(response,() =>{
                                 this.$success((this.$t('app.formpage.workflow.submitsuccess') as string), 'wfsubmit');
+                            })
                             resolve(response);
                         });
                     }).catch((response: any) => {

app_Web/public/assets/theme/default.less

@@ -1297,17 +1297,8 @@ body {
 
 .app-department-personnel {
     .ivu-select-selection {
-        .ivu-tag.ivu-tag-checked {
-            //  TODO
-            // background-color:@color-primary-shade;
-            // border-color: @item-background-color--active;
-            // color: @color-primary-contrast;
-            .editor-border-active;
-        }
-
         .ivu-icon.ivu-icon-ios-close:hover {
-            color: @item-text-color--hover;
-            // background-color: @item-background-color--hover;
+            color: @color-primary-base;
         }
 
         &:hover {
@@ -1398,10 +1389,13 @@ body {
     }
 }
 
+.app-form-group__action__showmore {
+  color: @color-primary-base;
+}
+
 .app-group-select {
     .el-icon-circle-close {
         &:hover {
-            //  TODO
             color: @color-primary-base;
         }
     }
@@ -1489,95 +1483,6 @@ body {
     }
 }
 
-.app-mavon-editor {
-
-    .v-note-panel {
-        // TODO
-        // color: @color-dark-contrast;
-
-        .v-show-content {
-            //  TODO
-            // background-color: @color-light-base;
-
-            table {
-                tr {
-                    //  TODO
-                    // background-color: @color-light-base;
-
-                    td,
-                    th {
-                        border-color: #666;
-                    }
-                }
-            }
-
-            pre,
-            .highlight pre {
-                color: #333;
-            }
-
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6 {
-                // TODO
-                // color: @color-dark-contrast;
-                border-color: #666;
-            }
-        }
-
-        .v-show-content-html {
-            // TODO
-            // background-color: @color-light-base;
-            border-left: 1px solid #666;
-        }
-
-        .content-input-wrapper {
-            // TODO
-            // background-color: @color-light-base;
-
-            textarea {
-                // color: @color-light-contrast;
-            }
-        }
-    }
-
-    .v-note-op {
-        // TODO
-        // background: @color-light-base;
-
-        .v-left-item {
-            .op-icon {
-                // color: @color-dark-contrast;
-            }
-
-            .op-icon-divider {
-                border-color: #666;
-            }
-        }
-
-        .v-right-item {
-            .op-icon {
-                // color: @color-dark-contrast;
-            }
-        }
-    }
-
-    .op-icon.dropdown-wrapper.dropdown .popup-dropdown {
-        .dropdown-item {
-            // color: @color-dark-contrast;
-        }
-
-        .dropdown-item:hover {
-            color: @item-text-color--hover;
-        }
-    }
-
-    border-color: #c7cbd1;
-}
-
 .app-mpicker-select-container {
     .el-select {
         .el-input__inner:hover {
@@ -1740,16 +1645,10 @@ body {
     }
 }
 
-.app-rawtime--markdown {
-    .app-mavon-editor {
-        .v-note-panel {
-            // TODO
-            // background-color: @color-light-base;
 
-            // .v-show-content {
-            //     background-color: @color-light-base;
-            // }
-        }
+.op-icon.dropdown-wrapper.dropdown .popup-dropdown {
+    .dropdown-item:hover {
+        color: @item-text-color--hover;
     }
 }
     
@@ -2034,10 +1933,8 @@ body {
         >.ivu-menu-submenu:hover {
             color: @header-text-color;
         }    
-
-        >.ivu-menu-submenu {
-            >.ivu-select-dropdown {
-                background: @app-background-color;
+    }
+    .ivu-select-dropdown {
 
         >.ivu-menu-drop-list {
 
@@ -2047,10 +1944,9 @@ body {
             }
         }
     }
-        }
-    }
 }
 
+
 .app-map-position {
     #map__result {
         .el-vue-search-box-container {
@@ -2147,7 +2043,7 @@ body {
 .app-content-bottom-exp{
     .ivu-tabs-tab.ivu-tabs-tab-active {
         .tab-exp-title {
-            border-bottom: 1px solid @color-primary-base;
+            border-bottom: 1px solid @app-divider-color;
         }
     }
 }
@@ -2233,3 +2129,44 @@ body {
         color: @color-primary-base;
     }
 }
+
+.upload-file{
+    .ivu-upload{
+        .ivu-upload-drag{
+            border:1px dashed @color-primary-base!important;
+        }
+    }
+    .upload-file__text{
+        border:1px dashed @color-primary-base;
+    }
+    .upload-file__text-style{
+        cursor: pointer;
+        color: @color-primary-base;
+    }
+}
+
+.context-menus-item:hover {
+    background-color: @menu-item-background-color--hover;
+    color: @menu-item-text-color--hover;
+}
+
+.sider-drawer {
+    .ivu-drawer {
+      background-color: @color-primary-base!important;
+    }
+}
+.context-menu-drag{
+    .context-menu__list {  
+        .context-menu__list__header {
+            border-bottom: 1px solid @app-divider-color;
+        }
+    }    
+}
+
+.tab-exp-item-content {
+    .toolbar-container {
+        >.ivu-btn.ivu-btn-default:disabled {
+            color: @button-text-color--disabled;
+        }
+    }
+}
\ No newline at end of file

app_Web/src/components/login/login.vue

@@ -347,6 +347,14 @@ export default class Login extends Vue {
                 // 跳转首页
                 const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
                 this.$router.push({ path: url });
+            }else{
+                const data = response.data;
+                if (data && data.message) {
+                    this.loginTip = data.message;
+                    this.$throw((this.$t('components.login.loginfailed') as string) + ' ' + data.message, 'handleSubmit');
+                } else {
+                    this.$throw(this.$t('components.login.loginfailed') as string, 'handleSubmit');
+                }
             }
         }).catch((error: any) => {
             // 登录提示

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

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-220-3">
+    <changeSet author="root" id="tab-book-222-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -194,7 +194,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-94-8">
+    <changeSet author="root" id="tab-reginfo-95-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -303,7 +303,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]外键关系 -->
-    <changeSet author="root" id="fk-reginfo-94-12">
+    <changeSet author="root" id="fk-reginfo-95-12">
        <addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/>
     </changeSet>
 

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

@@ -3,11 +3,53 @@
   "codeName" : "Main",
   "columnEnableLink" : 2,
   "controlType" : "GRID",
+  "getCreatePSControlAction" : {
+    "actionName" : "Create",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "create",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Create"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json",
   "getFetchPSControlAction" : {
     "modelref" : true,
     "id" : "fetch"
   },
+  "getGetDraftPSControlAction" : {
+    "actionName" : "GetDraft",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "loaddraft",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "GetDraft"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "getGetPSControlAction" : {
+    "actionName" : "Get",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "READ",
+    "name" : "load",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
   "groupMode" : "NONE",
   "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
   "logicName" : "主表格",
@@ -18,34 +60,34 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_ua98d563_click",
+    "name" : "grid_uagridcolumn1_u479f517_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_行编辑开关操作"
+      "id" : "表格界面_编辑操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u479f517_click",
+    "name" : "grid_uagridcolumn1_ua98d563_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_行编辑开关操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_行编辑开关操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "ToggleRowEdit"
+      "id" : "Edit"
     },
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   }, {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_行编辑开关操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "ToggleRowEdit"
     },
-    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   } ],
   "getPSControlLogics" : [ {
@@ -175,28 +217,6 @@
     "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" : {
@@ -224,6 +244,28 @@
         "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,
@@ -458,18 +500,32 @@
     }
   },
   "sortMode" : "REMOTE",
+  "getUpdatePSControlAction" : {
+    "actionName" : "Update",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "UPDATE",
+    "name" : "update",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Update"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
   "hasWFDataItems" : false,
   "enableColFilter" : false,
   "enableCustomized" : true,
   "enableGroup" : false,
   "enablePagingBar" : true,
-  "enableRowEdit" : false,
+  "enableRowEdit" : true,
   "enableRowEditOrder" : false,
-  "enableRowNew" : false,
+  "enableRowNew" : true,
   "forceFit" : false,
   "hideHeader" : false,
   "noSort" : false,
-  "singleSelect" : false,
+  "singleSelect" : true,
   "modelid" : "79298f0344beee0b6f745936bb3a2fcd",
   "modeltype" : "PSDEGRID"
 }
\ No newline at end of file