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

app_Web/src/components/app-panel-field/app-panel-field.vue

@@ -174,26 +174,28 @@ export default class AppPanelField extends Vue {
   /**
    * 值校验
    *
-   * @type {boolean}
    * @memberof AppPanelField
    */
-  public valueCheck: boolean = true;
+  get valueCheck() {
+    let valueCheck = true;
+    if (this.required && !this.value && this.valueChange) {
+      valueCheck = false;
+    }
+    return valueCheck;
+  }
 
   /**
-   * 编辑器值监控
+   * 值改变
    *
-   * @param {*} newVal
-   * @param {*} oldVal
    * @memberof AppPanelField
    */
+  public valueChange: boolean = false;
+
   @Watch("value")
   itemValueRules(newVal: any, oldVal: any) {
-    if (this.required && !newVal) {
-      this.valueCheck = false;
-    } else {
-      this.valueCheck = true;
-    }
+    this.valueChange = true;
   }
+
 }
 </script>
 <style lang='less'>

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

@@ -598,7 +598,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 };
@@ -634,7 +634,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

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

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1308,7 +1308,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1343,7 +1343,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public loadDraft(opt: any = {}): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1404,7 +1404,7 @@ export default class GuideBorrowFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1512,7 +1512,7 @@ export default class GuideBorrowFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1586,7 +1586,7 @@ export default class GuideBorrowFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue

@@ -1274,7 +1274,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1309,7 +1309,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public loadDraft(opt: any = {}): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1370,7 +1370,7 @@ export default class GuideReturnFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1478,7 +1478,7 @@ export default class GuideReturnFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1552,7 +1552,7 @@ export default class GuideReturnFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue

@@ -1377,7 +1377,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1412,7 +1412,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {}): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1473,7 +1473,7 @@ export default class GuideViewFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1581,7 +1581,7 @@ export default class GuideViewFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1655,7 +1655,7 @@ export default class GuideViewFormBase 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: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/has-panel-kan-ban-panel/has-panel-kan-ban-panel.less

-// this is less
 
 .kanban-title {
 	.item-field {
@@ -25,29 +24,3 @@
     text-overflow: ellipsis;
   }
 }
-.app-layoutpanel {
-    height: 100%;
-    .app-layoutpanel-container {
-        padding: 6px;
-    }
-    .app-layoutpanel-tabpanel{
-        >.el-tabs {
-            >.el-.el-tabs__header{
-                margin: 0 0 10px;
-            }
-            .app-layoutpanel-tabpage{
-                padding: 6px;
-            }
-        }
-    }
-    .app-layoutpanel-button,.app-layoutpanel-conctrl,.app-layoutpanel-ctrlpos,.app-layoutpanel-field,.app-layoutpanel-rowitem,.app-layoutpanel-usercontrol{
-        padding: 6px;
-    }
-    .item-field{
-        padding: 0 4px;
-        display: flex;
-        >.item-field-label{
-            padding: 0 8px;
-        }
-    }
-}
\ No newline at end of file

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

@@ -748,10 +748,10 @@
     "getAllPSPanelFields" : [ {
       "id" : "view_pagecaption"
     } ],
-    "codeName" : "TestCLCalendarView",
+    "codeName" : "Layoutpanel",
     "controlType" : "VIEWLAYOUTPANEL",
-    "layoutMode" : "FLEX",
-    "logicName" : "测试日历视图布局面板布局面板",
+    "layoutMode" : "TABLE_24COL",
+    "logicName" : "日历视图",
     "name" : "layoutpanel",
     "getPSAppDataEntity" : {
       "modelref" : true,
@@ -759,100 +759,117 @@
     },
     "getPSControlParam" : { },
     "getPSLayout" : {
-      "layout" : "FLEX"
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
     },
     "getRootPSPanelItems" : [ {
-      "caption" : "容器",
+      "caption" : "滚动条容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "page_container",
+      "name" : "container_scroll1",
       "getPSLayout" : {
-        "dir" : "column",
-        "layout" : "FLEX"
+        "layout" : "BORDER"
       },
       "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
       },
       "getPSPanelItems" : [ {
-        "caption" : "容器",
+        "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container2",
+        "name" : "container_scroll_main1",
         "getPSLayout" : {
-          "align" : "space-between",
-          "dir" : "row",
-          "layout" : "FLEX"
+          "layout" : "BORDER"
         },
         "getPSLayoutPos" : {
-          "grow" : -1,
-          "heightMode" : "FULL",
-          "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "getPSPanelItems" : [ {
-          "caption" : "页面标题",
+          "caption" : "日历",
           "itemStyle" : "DEFAULT",
-          "itemType" : "FIELD",
-          "name" : "view_pagecaption",
-          "getPSEditor" : {
-            "editorType" : "SPAN",
-            "name" : "view_pagecaption",
-            "predefinedType" : "VIEW_PAGECAPTION",
-            "renderMode" : "HEADING1",
-            "enableLinkView" : false
-          },
+          "itemType" : "CTRLPOS",
+          "name" : "calendar",
           "getPSLayoutPos" : {
-            "grow" : -1,
             "heightMode" : "FULL",
-            "layout" : "FLEX",
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER",
             "widthMode" : "FULL"
           },
-          "hidden" : false,
-          "showCaption" : false
-        } ]
+          "showCaption" : true
+        } ],
+        "showCaption" : true
       }, {
-        "caption" : "栅格容器",
+        "caption" : "面板容器",
+        "contentHeight" : 50.0,
+        "height" : 50.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container_scroll_header1",
         "getPSLayout" : {
-          "layout" : "SIMPLEFLEX"
+          "layout" : "BORDER"
         },
         "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+          "height" : 50,
+          "heightMode" : "PX",
+          "layout" : "BORDER",
+          "layoutPos" : "NORTH"
         },
         "getPSPanelItems" : [ {
-          "caption" : "面板容器",
+          "caption" : "栅格容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container1",
+          "name" : "container_grid1",
           "getPSLayout" : {
             "layout" : "SIMPLEFLEX"
           },
           "getPSLayoutPos" : {
-            "grow" : 12,
-            "layout" : "SIMPLEFLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "getPSPanelItems" : [ {
-            "caption" : "CALENDAR",
+            "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "calendar",
+            "itemType" : "CONTAINER",
+            "name" : "container1",
+            "getPSLayout" : {
+              "layout" : "SIMPLEFLEX"
+            },
             "getPSLayoutPos" : {
-              "grow" : -1,
-              "heightMode" : "FULL",
+              "grow" : 12,
               "layout" : "SIMPLEFLEX"
             },
-            "showCaption" : true
+            "getPSPanelItems" : [ {
+              "caption" : "页面标题",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "FIELD",
+              "name" : "view_pagecaption",
+              "getPSEditor" : {
+                "editorType" : "SPAN",
+                "name" : "view_pagecaption",
+                "predefinedType" : "VIEW_PAGECAPTION",
+                "renderMode" : "HEADING1",
+                "enableLinkView" : false
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "hAlignSelf" : "LEFT",
+                "layout" : "SIMPLEFLEX",
+                "vAlignSelf" : "MIDDLE"
+              },
+              "hidden" : false,
+              "showCaption" : false
+            } ]
           } ]
-        } ]
+        } ],
+        "showCaption" : true
       } ]
     } ],
-    "layoutBodyOnly" : false,
+    "layoutBodyOnly" : true,
     "layoutPanel" : true,
     "useDefaultLayout" : false,
-    "modelid" : "78B4846C-156B-442D-8A41-737260C57ED0",
+    "modelid" : "4E2DA5FF-F008-468F-9B06-4263146C817C",
     "modeltype" : "PSSYSVIEWLAYOUTPANEL"
   },
   "title" : "测试日历视图布局面板",

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-614-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-624-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>