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

app_Web/src/components/layout-element/login/app-login-message/app-login-message.less

 .app-login-message{
+    height: 40px;
+    width: 100%;
     .ivu-alert{
+        width: 100%;
+        height: 100%;
         display: flex;
         align-items: center;
         background-color: rgb(255, 225, 225);

app_Web/src/components/layout-element/login/app-login-message/app-login-message.vue

 <template>
-  <div class="app-login-message">
+  <div :class="[model.sysCss, 'app-login-message']" :style="containerStyle">
     <alert v-show="value" type="error" show-icon>{{ value }}</alert>
   </div>
 </template>
 
 <script lang='ts'>
+import { PanelFieldModel } from "@/model/panel-detail";
 import { Component, Vue, Prop } from "vue-property-decorator";
 
 @Component({})
-export default class AppPreSetLoginMessage extends Vue {
+export default class AppLoginMessage extends Vue {
 
     /**
-     * 内容
+     * 模型
      *
      * @type {string}
-     * @memberof AppPreSetLoginMessage
+     * @memberof AppLoginInput
      */
-    @Prop() public value?: string;
+    @Prop() public model!: PanelFieldModel;
+    
+    /**
+     * 值
+     *
+     * @type {string}
+     * @memberof AppLoginInput
+     */
+    @Prop() public value!: string;
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof AppLoginInput
+     */
+    @Prop() public name!: string;
+
+    /**
+     * 容器样式
+     *
+     * @type {any}
+     * @memberof AppLoginInput
+     */
+    public containerStyle: any = null;
+
+    public mounted() {
+        if (this.model) {
+            this.containerStyle = this.model.getElementStyle();
+        }
+    }
 
 }
 </script>

app_Web/src/components/layout-element/media/app-rawitem-carousel/app-rawitem-carousel.vue

 <template>
     <div class="app-rawitem-carousel">
-        <Carousel class="carsouel-container" :autoplay="swipeConfig.isAuto" :autoplay-speed="swipeConfig.timeSpan" radius-dot>
+        <Carousel class="carsouel-container" :autoplay="swipeConfig.isAuto" :autoplay-speed="swipeConfig.timeSpan"
+            radius-dot>
             <CarouselItem v-for="(item, index) in swipeData" :key="index">
                 <div class="carousel-img-item">
                     <a v-if="item.linkPath" :href="item.linkPath">
@@ -16,6 +17,8 @@
 </template>
 <script lang='ts'>
 import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
+import { ImgurlBase64 } from '@/utils';
+import { Environment } from "@/environments/environment";
 @Component({})
 export default class AppCarousel extends Vue {
     /**
@@ -24,7 +27,7 @@ export default class AppCarousel extends Vue {
      * @type {*}
      * @memberof AppPresetCarousel
      */
-     @Prop() public data?: any;
+    @Prop() public data?: any;
 
     /**
      * @description 轮播图数据
@@ -39,13 +42,13 @@ export default class AppCarousel extends Vue {
      * @memberof AppCarousel
      */
     @Prop() public cssStyle?: any;
-    
-        /**
-     * @description 样式表
-     * @param {*}
-     * @memberof AppCarousel
-     */
-     @Prop() public cssClass?: any;
+
+    /**
+ * @description 样式表
+ * @param {*}
+ * @memberof AppCarousel
+ */
+    @Prop() public cssClass?: any;
 
     /**
      * 名称
@@ -53,7 +56,7 @@ export default class AppCarousel extends Vue {
      * @type {string}
      * @memberof AppCarousel
      */
-     @Prop() public name!: string;
+    @Prop() public name!: string;
 
     /**
      * 类型
@@ -83,10 +86,10 @@ export default class AppCarousel extends Vue {
      * @param {*} oldVal
      * @memberof AppCarousel
      */
-    @Watch('data', { immediate: true, deep: true })
+    @Watch('value', { immediate: true, deep: true })
     public onDataChange(newVal: any, oldVal: any) {
         if (newVal) {
-            this.handleSwipData(newVal);
+            // this.handleSwipData(newVal);
         }
     }
 
@@ -95,13 +98,22 @@ export default class AppCarousel extends Vue {
      * @memberof AppCarousel
      */
     created() {
-        this.handleSwipData(this.value);
+        //处理轮播图-动态数据
+        if (this.type === "FIELD_CAROUSEL") {
+            if (this.value && typeof this.value === 'string') {
+                const swipeData = JSON.parse(this.value);
+                this.handleSwipData(swipeData);
+            }
+        } else if (this.type === "STATIC_CAROUSEL") {
+            //处理轮播图-静态数据
+            this.handleSwipData(this.value);
+        }
     }
 
-     /**
-     * @description 处理轮播图数据
-     * @memberof AppCarousel
-     */
+    /**
+    * @description 处理轮播图数据
+    * @memberof AppCarousel
+    */
     private handleSwipData(data: any) {
         if (data && data.length > 0) {
             const configItem = data.findIndex((item: any) =>
@@ -116,6 +128,9 @@ export default class AppCarousel extends Vue {
                 this.swipeConfig = this.setSwipeConfig(data);
             }
         }
+        this.swipeData = this.swipeData.map((item: any) => {
+            return this.addressProcessing(item);
+        });
     }
 
     /**
@@ -142,6 +157,51 @@ export default class AppCarousel extends Vue {
         };
     }
 
+    /**
+     * 处理轮播图地址
+     *
+     * @memberof AppPresetRawitem
+     */
+    private async addressProcessing(item: any) {
+        let _item: any = {};
+        if (this.type === "FIELD_CAROUSEL") {
+            let url = `${Environment.BaseUrl}${Environment.ExportFile}/${item.id}`;
+            let res = await ImgurlBase64.getInstance().getImgURLOfBase64(url);
+            _item.linkPath = item.linkPath;
+            _item.imgPath = res;
+            _item.iconClass = item.iconclass;
+        } else if (this.type === "STATIC_CAROUSEL") {
+            _item.linkPath = item.linkPath;
+            _item.imgPath = this.getImagePath(item);
+            _item.iconClass = this.getImageClass(item) || '';
+        }
+
+
+        return _item;
+    }
+    //TODO
+    /**
+     * 获取图片路径
+     *
+     * @memberof AppPresetRawitem
+     */
+     public getImagePath(item: any) {
+        if (item && item.getPSSysImage && item.getPSSysImage.imagePath) {
+            return item.getPSSysImage.imagePath;
+        }
+    }
+
+    /**
+     * @description 获取imageClass
+     * @param {*}
+     * @memberof AppRawItem
+     */
+    public getImageClass(item: any) {
+        if (item && item.getPSSysImage && item.getPSSysImage.cssClass) {
+            return item.getPSSysImage.cssClass;
+        }
+    }
+
     /**
      * 处理图标大小
      * @memberof AppMobCarousel

app_Web/src/locale/lang/BO-CN-base.ts

@@ -371,6 +371,7 @@ function getAppLocale(){
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),
                     menuitem130: commonLogic.appcommonhandle("布局面板组件测试",null),
                     menuitem131: commonLogic.appcommonhandle("编辑视图（左右关系）",null),
+                    menuitem142: commonLogic.appcommonhandle("列表视图（自定义面板）",null),
                 },
             },
             formpage:{

app_Web/src/locale/lang/en-US-base.ts

@@ -371,6 +371,7 @@ function getAppLocale(){
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),
                     menuitem130: commonLogic.appcommonhandle("布局面板组件测试",null),
                     menuitem131: commonLogic.appcommonhandle("编辑视图（左右关系）",null),
+                    menuitem142: commonLogic.appcommonhandle("列表视图（自定义面板）",null),
                 },
             },
             formpage:{

app_Web/src/locale/lang/zh-CN-base.ts

@@ -371,6 +371,7 @@ function getAppLocale(){
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),
                     menuitem130: commonLogic.appcommonhandle("布局面板组件测试",null),
                     menuitem131: commonLogic.appcommonhandle("编辑视图（左右关系）",null),
+                    menuitem142: commonLogic.appcommonhandle("列表视图（自定义面板）",null),
                 },
             },
             formpage:{

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_BO_CN_base.ts

@@ -1905,8 +1905,6 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("删除",null),
 			},
 		},
-		usr5dataviewtoolbar_toolbar: {
-		},
 		testcllistviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),
@@ -1961,6 +1959,8 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("删除",null),
 			},
 		},
+		usr5dataviewtoolbar_toolbar: {
+		},
 		treemajorstate_treeview: {
 			nodata:commonLogic.appcommonhandle("",null),
 			nodes: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US_base.ts

@@ -1905,8 +1905,6 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("Remove {0}",null),
 			},
 		},
-		usr5dataviewtoolbar_toolbar: {
-		},
 		testcllistviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("New",null),
@@ -1961,6 +1959,8 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("Remove {0}",null),
 			},
 		},
+		usr5dataviewtoolbar_toolbar: {
+		},
 		treemajorstate_treeview: {
 			nodata:commonLogic.appcommonhandle("",null),
 			nodes: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN_base.ts

@@ -1905,8 +1905,6 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("删除",null),
 			},
 		},
-		usr5dataviewtoolbar_toolbar: {
-		},
 		testcllistviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),
@@ -1961,6 +1959,8 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("删除",null),
 			},
 		},
+		usr5dataviewtoolbar_toolbar: {
+		},
 		treemajorstate_treeview: {
 			nodata:commonLogic.appcommonhandle("",null),
 			nodes: {

app_Web/src/pages/sample/ibizappctrllist-view/ibizappctrllist-view.less

@@ -20,3 +20,4 @@
 .portal-listview-noboxshadow{
   box-shadow: 0px 0px 0px;
 }
+

app_Web/src/pages/sample/ibizappeditorlist-view/ibizappeditorlist-view.less

@@ -20,3 +20,4 @@
 .portal-listview-noboxshadow{
   box-shadow: 0px 0px 0px;
 }
+

app_Web/src/pages/sample/ibizappextendeditorlist-view/ibizappextendeditorlist-view.less

@@ -20,3 +20,4 @@
 .portal-listview-noboxshadow{
   box-shadow: 0px 0px 0px;
 }
+

app_Web/src/pages/sample/ibizappviewlist-view/ibizappviewlist-view.less

@@ -20,3 +20,4 @@
 .portal-listview-noboxshadow{
   box-shadow: 0px 0px 0px;
 }
+

app_Web/src/pages/sample/ibizbookauto-group-list-view/ibizbookauto-group-list-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbookcalendar-view/ibizbookcalendar-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbookedit-view4/ibizbookedit-view4.less

@@ -20,4 +20,4 @@
 
 .view-container.ibizbookedit-view4 > .view-card > .ivu-card-body > .content-container {
     height: calc(100% - 30px);
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizbookgroup-by-codelist-kan-ban-view/ibizbookgroup-by-codelist-kan-ban-view.less

@@ -20,4 +20,4 @@
 
 .ibizbookgroup-by-codelist-kan-ban-view{
     display: block;
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizbookgroup-by-codelist-list-view/ibizbookgroup-by-codelist-list-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbookhas-panel-kan-ban-view/ibizbookhas-panel-kan-ban-view.less

@@ -20,4 +20,4 @@
 
 .ibizbookhas-panel-kan-ban-view{
     display: block;
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizbookhas-panel-list-view/ibizbookhas-panel-list-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbookinter-func-kan-ban-view/ibizbookinter-func-kan-ban-view.less

@@ -20,4 +20,4 @@
 
 .ibizbookinter-func-kan-ban-view{
     display: block;
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizbooklist-view/ibizbooklist-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbooktest-cllist-view/ibizbooktest-cllist-view.less

+.ibizbooktest-cllist-view {
+    display: block;
+}

app_Web/src/pages/sample/ibizbooktest-cllist-view/ibizbooktest-cllist-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZBOOKTestCLListViewBase from './ibizbooktest-cllist-view-base.vue';
+
+import view_searchform from '@widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform.vue';
+import view_list from '@widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list.vue';
+@Component({
+    components: {
+        view_searchform, 
+        view_list, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBIZBOOKTestCLListView extends IBIZBOOKTestCLListViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/sample/ibizbooktree-view/ibizbooktree-view.less

@@ -21,3 +21,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizbookusr2-calendar-view/ibizbookusr2-calendar-view.less

@@ -3,3 +3,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizbookusr2-list-view/ibizbookusr2-list-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbookusr2-tree-view/ibizbookusr2-tree-view.less

@@ -21,3 +21,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizbookusr3-calendar-view/ibizbookusr3-calendar-view.less

@@ -3,3 +3,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizbookusr3-list-view/ibizbookusr3-list-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbookusr4-calendar-view/ibizbookusr4-calendar-view.less

@@ -3,3 +3,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizbookusr4-list-view/ibizbookusr4-list-view.less

@@ -17,3 +17,4 @@
         // this is less
 
 
+

app_Web/src/pages/sample/ibizbookusr5-calendar-view/ibizbookusr5-calendar-view.less

@@ -3,3 +3,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizorder-area-chart-view/ibizorder-area-chart-view.less

@@ -8,4 +8,4 @@
     > .view-card > .ivu-card-body > .content-container > .app-data-chart {
         overflow: auto;
     }
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-bar-chart-view/ibizorder-bar-chart-view.less

@@ -8,4 +8,4 @@
     > .view-card > .ivu-card-body > .content-container > .app-data-chart {
         overflow: auto;
     }
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-calendar-exp-view/ibizorder-calendar-exp-view.less

@@ -5,4 +5,4 @@
 
 .ibizorder-calendar-exp-view{
     display: block;
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-detail-list-view/ibizorder-detail-list-view.less

@@ -6,3 +6,4 @@
 .portal-listview-noboxshadow{
   box-shadow: 0px 0px 0px;
 }
+

app_Web/src/pages/sample/ibizorder-line-chart-view/ibizorder-line-chart-view.less

@@ -8,4 +8,4 @@
     > .view-card > .ivu-card-body > .content-container > .app-data-chart {
         overflow: auto;
     }
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-list-exp-view/ibizorder-list-exp-view.less

@@ -5,4 +5,4 @@
 
 .ibizorder-list-exp-view{
     display: block;
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-pie-chart-view/ibizorder-pie-chart-view.less

@@ -8,4 +8,4 @@
     > .view-card > .ivu-card-body > .content-container > .app-data-chart {
         overflow: auto;
     }
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-radar-chart-view/ibizorder-radar-chart-view.less

@@ -8,4 +8,4 @@
     > .view-card > .ivu-card-body > .content-container > .app-data-chart {
         overflow: auto;
     }
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-sedit-view3/ibizorder-sedit-view3.less

@@ -25,3 +25,4 @@
 
 .deepskyblueToolBar {color:white !important;background-color:#108cee !important;}
 
+

app_Web/src/pages/sample/ibizorder-sedit-view4/ibizorder-sedit-view4.less

@@ -21,4 +21,4 @@
 
 .view-container.ibizorder-sedit-view4 > .view-card > .ivu-card-body > .content-container {
     height: calc(100% - 30px);
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-tree-exp-view/ibizorder-tree-exp-view.less

@@ -10,3 +10,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizorder-usr2-calendar-exp-view/ibizorder-usr2-calendar-exp-view.less

@@ -5,4 +5,4 @@
 
 .ibizorder-usr2-calendar-exp-view{
     display: block;
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-usr2-chart-view/ibizorder-usr2-chart-view.less

@@ -8,4 +8,4 @@
     > .view-card > .ivu-card-body > .content-container > .app-data-chart {
         overflow: auto;
     }
-}
+}
\ No newline at end of file

app_Web/src/pages/sample/ibizsample0003-f1-tree-exp-view/ibizsample0003-f1-tree-exp-view.less

@@ -10,3 +10,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizsample0003-f2-tree-exp-view/ibizsample0003-f2-tree-exp-view.less

@@ -10,3 +10,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizsample0003-f3-tree-exp-view/ibizsample0003-f3-tree-exp-view.less

@@ -10,3 +10,4 @@
 }
 
 
+

app_Web/src/pages/sample/ibizsample0003-f4-tree-exp-view/ibizsample0003-f4-tree-exp-view.less

@@ -10,3 +10,4 @@
 }
 
 
+

app_Web/src/pages/sample/index/page-register.ts

@@ -108,6 +108,7 @@ export const PageComponents = {
         Vue.component('ibizcustomer-media-test-edit-view', () => import('@pages/sample/ibizcustomer-media-test-edit-view/ibizcustomer-media-test-edit-view.vue'));
         Vue.component('ibizorder-test-custom-layout-panel-grid-exp-view', () => import('@pages/sample/ibizorder-test-custom-layout-panel-grid-exp-view/ibizorder-test-custom-layout-panel-grid-exp-view.vue'));
         Vue.component('ibizorder-test-cledit-view2', () => import('@pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.vue'));
+        Vue.component('ibizbooktest-cllist-view', () => import('@pages/sample/ibizbooktest-cllist-view/ibizbooktest-cllist-view.vue'));
         Vue.component('ibizappviewgrid-view', () => import('@pages/sample/ibizappviewgrid-view/ibizappviewgrid-view.vue'));
         Vue.component('ibizappviewlist-view', () => import('@pages/sample/ibizappviewlist-view/ibizappviewlist-view.vue'));
         Vue.component('ibizappctrlgrid-view', () => import('@pages/sample/ibizappctrlgrid-view/ibizappctrlgrid-view.vue'));

app_Web/src/pages/sample/index/router.ts

@@ -1678,6 +1678,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/testcllistview/:testcllistview?',
+                    meta: {
+                        caption: 'entities.ibizbook.views.testcllistview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'testcllistview', parameterName: 'testcllistview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbooktest-cllist-view/ibizbooktest-cllist-view.vue'),
+                },
                 {
                     path: 'ibizappviews/:ibizappview?/gridview/:gridview?',
                     meta: {
@@ -4081,6 +4095,19 @@ const router = new Router({
                 },
                 component: () => import('@pages/sample/ibizuniproduct-redirect-view/ibizuniproduct-redirect-view.vue'),
             },
+    {
+        path: '/ibizbooks/:ibizbook?/testcllistview/:testcllistview?',
+        meta: {
+            caption: 'entities.ibizbook.views.testcllistview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'testcllistview', parameterName: 'testcllistview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbooktest-cllist-view/ibizbooktest-cllist-view.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/ibizorderdetails/:ibizorderdetail?/sf2editview/:sf2editview?',
         meta: {

app_Web/src/pages/ungroup/app-index-view/router.ts

@@ -1309,6 +1309,19 @@ const router = new Router({
                 },
                 component: () => import('@pages/sample/ibizuniproduct-redirect-view/ibizuniproduct-redirect-view.vue'),
             },
+    {
+        path: '/ibizbooks/:ibizbook?/testcllistview/:testcllistview?',
+        meta: {
+            caption: 'entities.ibizbook.views.testcllistview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'testcllistview', parameterName: 'testcllistview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbooktest-cllist-view/ibizbooktest-cllist-view.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/ibizorderdetails/:ibizorderdetail?/sf2editview/:sf2editview?',
         meta: {

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

@@ -38,7 +38,7 @@
         <app-login-note-verify />
         </template>
         <template #auth_loginmsg>
-        <app-login-message />
+        <app-login-message name="auth_loginmsg" :model="layoutModelDetails.auth_loginmsg" :value="layoutData.auth_loginmsg" />
         </template>
         <template #auth_sso1>
         <app-login-third />

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

@@ -786,6 +786,7 @@ export const viewstate: any = {
                 '38b0b453d423e0772822db6be4f02505',
                 '2D42F3B7-3267-4276-9120-10F2D81E35AF',
                 'D6D7779F-95C9-48C0-B2E1-ED4C20E5E157',
+                '79C13556-8423-4886-ADB3-6FF73C1E97F1',
             ],
         },
         {
@@ -1047,6 +1048,16 @@ export const viewstate: any = {
                 '88ca61cdf39cd0f97cf3863e9a6974b3',
             ],
         },
+        {
+            viewtag: '79C13556-8423-4886-ADB3-6FF73C1E97F1',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKTestCLListView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '58e37ccddda10feedac7c809d5cee02a',
+            ],
+        },
         {
             viewtag: '7ccb985d6fc6a6795502a2ba742f95b5',
             viewmodule: 'Sample',

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-base.vue

@@ -928,6 +928,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'UsrAppFunc1103768001': 
                     this.clickUsrAppFunc1103768001(item);
                     return;
+                case 'UsrAppFunc1103202475': 
+                    this.clickUsrAppFunc1103202475(item);
+                    return;
                 default:
                     console.warn('未指定应用功能');
             }
@@ -3460,6 +3463,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
             this.$router.push(path);
         })
     }
+    
+    /**
+     * 列表视图（自定义面板）
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickUsrAppFunc1103202475(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'testcllistview', parameterName: 'testcllistview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
 
     /**
      * 数据加载

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

@@ -590,7 +590,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: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -626,7 +626,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: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -621,7 +621,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -657,7 +657,7 @@ export default class QUICKSEARCHFORMBase 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: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -291,7 +291,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -413,20 +413,6 @@ 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;
     
     /**
     * 是否嵌入关系界面
@@ -959,7 +945,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1054,7 +1040,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1160,7 +1146,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2077,7 +2063,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(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);
@@ -2085,7 +2071,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){
@@ -2152,7 +2138,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

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

@@ -104,21 +104,6 @@ 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',

app_Web/src/widgets/ibizorder/sform-form/sform-form-base.vue

@@ -1545,7 +1545,7 @@ export default class SFormBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1580,7 +1580,7 @@ export default class SFormBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {}): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1642,7 +1642,7 @@ export default class SFormBase extends Vue implements ControlInterface {
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1750,7 +1750,7 @@ export default class SFormBase extends Vue implements ControlInterface {
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1827,7 +1827,7 @@ export default class SFormBase extends Vue implements ControlInterface {
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];