tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/components/layout-element/structure/app-scroll-container/app-scroll-container.vue

@@ -124,7 +124,7 @@ export default class AppScrollContainer extends Vue {
      *
      * @memberof AppScrollContainer
      */
-    public initScrollContainer() {
+    public initScrollContainer() {      
         let minusHeight = '';
         let minusWidth: string = '';
         this.containerModel = {};
@@ -141,14 +141,14 @@ export default class AppScrollContainer extends Vue {
                     const { name, layoutWidth, widthMode, layoutHeight, heightMode, layoutPos } = childModelDetail;
                     const style = {};
                     if (layoutWidth) {
-                        Object.assign(style, { width: Util.getBoxSize('WIDTH', widthMode, layoutWidth).width });
                         if (layoutPos && (Object.is(layoutPos, 'WEST') || Object.is(layoutPos, 'EAST'))) {
+                            Object.assign(style, { width: Util.getBoxSize('WIDTH', widthMode, layoutWidth).width });
                             minusWidth += ` - ${Util.getBoxSize('WIDTH', widthMode, layoutWidth).width}`;
                         }
                     }
                     if (layoutHeight) {
-                        Object.assign(style, { height: Util.getBoxSize('HEIGHT', heightMode, layoutHeight).height });
                         if (layoutPos && (Object.is(layoutPos, 'NORTH') || Object.is(layoutPos, 'SOUTH'))) {
+                            Object.assign(style, { height: Util.getBoxSize('HEIGHT', heightMode, layoutHeight).height });
                             minusHeight += ` - ${Util.getBoxSize('HEIGHT', heightMode, layoutHeight).height}`;
                         }
                     }

app_Web/src/model/panel-detail/panel-detail.ts

@@ -437,26 +437,30 @@ export class PanelDetailModel {
      */
     protected getBoxLayOutStyle() {
         const boxStyle = {};
-        // 识别FLEX
-        if (this.layout == 'FLEX') {
-            Object.assign(boxStyle, { 'flex-grow': this.flexGrow ? this.flexGrow : 0 });
-        }
-        // 识别SIMPLEFLEX
-        if (this.layout == 'SIMPLEFLEX') {
-            if (this.flexGrow) {
-                Object.assign(boxStyle, { 'width': `${(100 / 12) * this.flexGrow}%`, 'height': '100%' });
-            } else {
-                // 简单FLEX布局自适应
-                Object.assign(boxStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, 'height': '100%' });
-            }
-        }
         if (this.parentName && this.panel) {
             const parentItem = this.panel.layoutModelDetails[this.parentName];
-            // 当前项兄弟项个数大于1且本身设置宽或者高默认不占满
-            if (parentItem && parentItem.details && parentItem.details.length > 1) {
-                const boxSizeStyle: any = this.getBoxSizeStyle();
-                if (boxSizeStyle && Object.keys(boxSizeStyle).length > 0) {
-                    Object.assign(boxStyle, { 'flex-grow': 0 });
+            // 识别父FLEX
+            if (parentItem.layout == 'FLEX') {
+                Object.assign(boxStyle, { 'display': 'contents' });
+                Object.assign(boxStyle, { 'flex-grow': this.flexGrow ? this.flexGrow : 0 });
+            }
+            // 识别SIMPLEFLEX
+            else if (parentItem.layout == 'SIMPLEFLEX') {
+                // SIMPLEFLEX 按照内容撑大小
+                Object.assign(boxStyle, { 'flex-grow': 0 });
+                if (this.flexGrow !== -1) {
+                    Object.assign(boxStyle, { 'width': `${(100 / 12) * this.flexGrow}%`, 'height': '100%' });
+                } else {
+                    // 简单FLEX布局自适应
+                    Object.assign(boxStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, 'height': '100%' });
+                }
+            } else {
+                // 当前项兄弟项个数大于1且本身设置宽或者高默认不占满
+                if (parentItem && parentItem.details && parentItem.details.length > 1) {
+                    const boxSizeStyle: any = this.getBoxSizeStyle();
+                    if (boxSizeStyle && Object.keys(boxSizeStyle).length > 0) {
+                        Object.assign(boxStyle, { 'flex-grow': 0 });
+                    }
                 }
             }
         }

app_Web/src/pages/sample/ibizcustomer-media-test-edit-view/ibizcustomer-media-test-edit-view-base.vue

@@ -123,7 +123,7 @@
         <app-preset-text name="field_text_dynamic" :index="slotProps.data.index" :value="layoutData[`field_text_dynamic_${slotProps.data.index}`]" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_textbox>
-        <app-panel-field name="field_textbox" :index="slotProps.data.index" :layoutModelDetails="layoutModelDetails" :value="layoutData[`field_textbox_${slotProps.data.index}`]"> <input-box type="text" name="field_textbox" :value="layoutData[`field_textbox_${slotProps.data.index}`]" :disabled="layoutModelDetails[`field_textbox_${slotProps.data.index}`] ? layoutModelDetails[`field_textbox_${slotProps.data.index}`].disabled : false" @change="(value) => handleValueChange({ name: `field_textbox_${slotProps.data.index}`, value}, `${slotProps.data.index}`)"> </input-box> </app-panel-field>
+        <app-panel-field name="field_textbox" :index="slotProps.data.index" :layoutModelDetails="layoutModelDetails" :value="layoutData[`field_textbox_${slotProps.data.index}`]"> <input-box type="text" name="field_textbox" :itemValue="layoutData[`field_textbox_${slotProps.data.index}`]" :disabled="layoutModelDetails[`field_textbox_${slotProps.data.index}`] ? layoutModelDetails[`field_textbox_${slotProps.data.index}`].disabled : false" @change="(value) => handleValueChange({ name: `field_textbox_${slotProps.data.index}`, value}, `${slotProps.data.index}`)"> </input-box> </app-panel-field>
         </template>
     </app-standard-container>
         </template>

app_Web/src/pages/ungroup/app-index-view/app-index-view-base.vue

@@ -18,22 +18,22 @@
         <app-preset-text name="field_text_dynamic" :value="layoutData.field_text_dynamic" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_textbox4>
-        <app-panel-field name="field_textbox4" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox4"> <input-box type="text" name="field_textbox4" :value="layoutData.field_textbox4" :disabled="layoutModelDetails.field_textbox4 ? layoutModelDetails.field_textbox4.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox4', value})"> </input-box> </app-panel-field>
+        <app-panel-field name="field_textbox4" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox4"> <input-box type="text" name="field_textbox4" :itemValue="layoutData.field_textbox4" :disabled="layoutModelDetails.field_textbox4 ? layoutModelDetails.field_textbox4.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox4', value})"> </input-box> </app-panel-field>
         </template>
         <template #field_switch>
         <app-preset-switch name="field_switch" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_switch" @valueChange="handleValueChange"/>
         </template>
         <template #field_textbox>
-        <app-panel-field name="field_textbox" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox"> <input-box type="text" name="field_textbox" :value="layoutData.field_textbox" :disabled="layoutModelDetails.field_textbox ? layoutModelDetails.field_textbox.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox', value})"> </input-box> </app-panel-field>
+        <app-panel-field name="field_textbox" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox"> <input-box type="text" name="field_textbox" :itemValue="layoutData.field_textbox" :disabled="layoutModelDetails.field_textbox ? layoutModelDetails.field_textbox.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox', value})"> </input-box> </app-panel-field>
         </template>
         <template #field_textbox1>
-        <app-panel-field name="field_textbox1" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox1"> <dropdown-list :value="layoutData.field_textbox1" :data="layoutData" :context="context" :viewparams="viewparams" :formState="viewState" :disabled="layoutModelDetails.field_textbox1 ? layoutModelDetails.field_textbox1.disabled : false" :localContext='{ }' :localParam='{ }' placeholder='请选择...' @change="(value) => handleValueChange({ name: 'field_textbox1', value})"> </dropdown-list> </app-panel-field>
+        <app-panel-field name="field_textbox1" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox1"> <dropdown-list :itemValue="layoutData.field_textbox1" :data="layoutData" :context="context" :viewparams="viewparams" :formState="viewState" :disabled="layoutModelDetails.field_textbox1 ? layoutModelDetails.field_textbox1.disabled : false" :localContext='{ }' :localParam='{ }' placeholder='请选择...' @change="(value) => handleValueChange({ name: 'field_textbox1', value})"> </dropdown-list> </app-panel-field>
         </template>
         <template #field_textbox2>
-        <app-panel-field name="field_textbox2" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox2"> <input-box type="number" :precision="2" :value="layoutData.field_textbox2" :disabled="layoutModelDetails.field_textbox2 ? layoutModelDetails.field_textbox2.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox2', value})"> </input-box> </app-panel-field>
+        <app-panel-field name="field_textbox2" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox2"> <input-box type="number" :precision="2" :itemValue="layoutData.field_textbox2" :disabled="layoutModelDetails.field_textbox2 ? layoutModelDetails.field_textbox2.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox2', value})"> </input-box> </app-panel-field>
         </template>
         <template #field_textbox3>
-        <app-panel-field name="field_textbox3" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox3"> <input-box type="password" name="field_textbox3" :value="layoutData.field_textbox3" :disabled="layoutModelDetails.field_textbox3 ? layoutModelDetails.field_textbox3.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox3', value})"> </input-box> </app-panel-field>
+        <app-panel-field name="field_textbox3" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox3"> <input-box type="password" name="field_textbox3" :itemValue="layoutData.field_textbox3" :disabled="layoutModelDetails.field_textbox3 ? layoutModelDetails.field_textbox3.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox3', value})"> </input-box> </app-panel-field>
         </template>
         <template #field_qrcode>
         <app-preset-qrcode name="field_qrcode" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_qrcode" />

app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue

@@ -628,7 +628,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -664,7 +664,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -701,7 +701,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -737,7 +737,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/listpanel-panel/listpanel-panel-base.vue

@@ -12,7 +12,7 @@
         <app-preset-text name="field_text_dynamic" :value="layoutData.field_text_dynamic" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_textbox>
-        <app-panel-field name="field_textbox" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox"> <input-box type="text" name="field_textbox" :value="layoutData.field_textbox" :disabled="layoutModelDetails.field_textbox ? layoutModelDetails.field_textbox.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox', value})"> </input-box> </app-panel-field>
+        <app-panel-field name="field_textbox" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox"> <input-box type="text" name="field_textbox" :itemValue="layoutData.field_textbox" :disabled="layoutModelDetails.field_textbox ? layoutModelDetails.field_textbox.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox', value})"> </input-box> </app-panel-field>
         </template>
         <template #button_link1>
         <app-preset-button name="button_link1" :layoutModelDetails="layoutModelDetails" @itemClick="handleButtonClick" />

app_Web/src/widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list-base.vue

@@ -46,11 +46,11 @@
             <span class="quick-toolbar">
                             <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="listviewlist_quicktoolbarModels.deuiaction1.visabled" :disabled="listviewlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-file-text-o'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
             </div>
             </span>
@@ -61,18 +61,18 @@
         <span class="batch-toolbar">
                     <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction1.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction2.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
         </span>
@@ -362,7 +362,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
          const _this: any = this;
@@ -382,7 +382,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -408,7 +408,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -613,9 +613,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr4ListView_layout
+     * @memberof IBIZBOOKListView
      */
-    public usr4listview_layoutlist_quicktoolbarModels: any = {
+    public listviewlist_quicktoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
     };
@@ -625,9 +625,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr4ListView_layout
+     * @memberof IBIZBOOKListView
      */
-    public usr4listview_layoutlist_batchtoolbarModels: any = {
+    public listviewlist_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -850,7 +850,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public load(opt: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -966,7 +966,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -1061,7 +1061,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1069,7 +1069,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -299,7 +299,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderPickupGridViewBase
+     * @memberof IBIZOrderSF1GridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -365,7 +365,7 @@ export default class MainBase extends Vue implements ControlInterface {
         const data = args && args.data ? args.data : this.getData() || {};
         const event = args && args.event ? args.event : {};
         let result: boolean = true;
-        if ('rowdblclick;selectionchange;load;beforeload'.indexOf(eventName) !== -1) {
+        if ('rowdblclick;selectionchange;remove;load;beforeload'.indexOf(eventName) !== -1) {
             result = await this.execute_engine_grid_ctrl_logic(data, event);
         }
         if (!result) {
@@ -451,6 +451,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -983,7 +997,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1078,7 +1092,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1184,7 +1198,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2101,7 +2115,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2109,7 +2123,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){
@@ -2176,7 +2190,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -104,6 +104,21 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_orderstate_eq',
+        prop: 'n_orderstate_eq',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_gt',
+        prop: 'n_ordertime_gt',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_lt',
+        prop: 'n_ordertime_lt',
+        dataType: 'QUERYPARAM'
+      },
 
         {
           name:'size',

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json

@@ -19,6 +19,16 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
     "caption" : "作者",
     "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
@@ -38,16 +48,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json

@@ -75,6 +75,16 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
       "caption" : "作者",
       "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
@@ -94,16 +104,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {