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

7726813b · ibizdev · 62dc8a37 · 7726813b · 7726813b · 7726813b
--- a/app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-dataview-base.tsx
+++ b/app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-dataview-base.tsx
@@ -67,7 +67,20 @@ export class AppDataViewBase extends DataViewControlBase {
    @Emit('ctrl-event')
    public ctrlEvent({ controlname, action, data }: { controlname: string, action: string, data: any }): void { }

-
+    /**
+     * @description 是否显示回到顶部
+     * @readonly
+     * @type {boolean}
+     * @memberof AppDataViewBase
+     */
+     get backTopVisible(): boolean {
+      let visible: boolean = false;
+      const el = document.querySelector(`#${this.controlId}`);
+      if (el) {
+        visible = true;
+      }
+      return visible;
+    }

    /**
     * 绘制分组

--- a/app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-searchform-base.tsx
+++ b/app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-searchform-base.tsx
@@ -71,6 +71,14 @@ export class AppSearchFormBase extends SearchFormControlBase {
    @Emit('ctrl-event')
    public ctrlEvent({ controlname, action, data }: { controlname: string; action: string; data: any }): void { }

+    
+    /**
+     * @description 是否显示搜索下拉
+     * @type {boolean}
+     * @memberof AppSearchFormBase
+     */
+    public dropdownVisible: boolean = false;
+
    /**
     * 销毁视图回调
     *
@@ -528,6 +536,17 @@ export class AppSearchFormBase extends SearchFormControlBase {
        }
    }

+    /**
+     * @description 点击外部区域关闭下拉
+     * @memberof AppSearchFormBase
+     */
+    public clickOutside(event: any) {
+      const className: string = event.target.className;
+      if (!className.includes('save-search') && className !== 'ivu-input ivu-input-default' && !className.includes('history-item')) {
+        this.dropdownVisible = false;
+      }
+    }
+
    /**
     * 获取搜索内容或按钮样式
     * 

--- a/app_Web/packages/ibiz-vue/src/components/control/app-default-searchform/app-default-searchform.less
+++ b/app_Web/packages/ibiz-vue/src/components/control/app-default-searchform/app-default-searchform.less
@@ -5,7 +5,7 @@
  padding: 14px 0;
 }
 .app-search-form {
-  height: 100%;
+  height: auto;
  .ivu-form-item{
    margin-bottom: 8px;
  }

--- a/app_Web/packages/ibiz-vue/src/components/layout/app-style4-layout/app-style4-default-layout/app-style4-default-layout.less
+++ b/app_Web/packages/ibiz-vue/src/components/layout/app-style4-layout/app-style4-default-layout/app-style4-default-layout.less
@@ -130,7 +130,7 @@
                display: flex;
                margin: 0;
                flex-direction: column;
-                overflow: auto;
+                overflow-y: scroll;
            }
        }
    }

--- a/app_Web/packages/ibiz-vue/src/widgets/dataview-control-base.tsx
+++ b/app_Web/packages/ibiz-vue/src/widgets/dataview-control-base.tsx
@@ -235,21 +235,6 @@ export class DataViewControlBase extends MDControlBase implements DataViewContro
     * @memberof DataViewControlBase
     */
    public dataviewControlEvent: Subscription | undefined;
-    
-    /**
-     * @description 是否显示回到顶部
-     * @readonly
-     * @type {boolean}
-     * @memberof DataViewControlBase
-     */
-    get backTopVisible(): boolean {
-      let visible: boolean = false;
-      const el = document.querySelector(`#${this.controlId}`);
-      if (el) {
-        visible = true;
-      }
-      return visible;
-    }

    /**
     * 监听静态参数变化

--- a/app_Web/packages/ibiz-vue/src/widgets/searchform-control-base.tsx
+++ b/app_Web/packages/ibiz-vue/src/widgets/searchform-control-base.tsx
@@ -76,13 +76,6 @@ export class SearchFormControlBase extends EditFormControlBase implements Search
     */
    public enableSaveFilter: boolean = true;

-    /**
-     * @description 是否显示搜索下拉
-     * @type {boolean}
-     * @memberof SearchFormControlBase
-     */
-    public dropdownVisible: boolean = false;
-
    /**
     * 监听静态参数变化
     *
@@ -296,17 +289,6 @@ export class SearchFormControlBase extends EditFormControlBase implements Search
        });
    }

-    /**
-     * @description 点击外部区域关闭下拉
-     * @memberof SearchFormControlBase
-     */
-    public clickOutside(event: any) {
-      const className: string = event.target.className;
-      if (!className.includes('save-search') && className !== 'ivu-input ivu-input-default' && !className.includes('history-item')) {
-        this.dropdownVisible = false;
-      }
-    }
-
    /**
     * 搜索
     *

--- a/trainsys-core/src/main/resources/liquibase/h2_table.xml
+++ b/trainsys-core/src/main/resources/liquibase/h2_table.xml
@@ -50,7 +50,7 @@
    </changeSet>

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

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
@@ -647,7 +647,18 @@
          },
          "editorType" : "PICKER",
          "handlerType" : "PickupText",
+          "getLinkPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+            "viewType" : "DEGRIDVIEW"
+          },
          "name" : "field9",
+          "getPickupPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phonePhoneView.json",
+            "viewType" : "DEGRIDVIEW"
+          },
+          "valueItemName" : "type",
          "enableAC" : true,
          "enablePickupView" : true,
          "forceSelection" : true,
@@ -658,6 +669,7 @@
          "colMD" : 24,
          "layout" : "TABLE_24COL"
        },
+        "valueItemName" : "type",
        "allowEmpty" : true,
        "showCaption" : true
      }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
@@ -768,7 +768,18 @@
            },
            "editorType" : "PICKER",
            "handlerType" : "PickupText",
+            "getLinkPSAppView" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+              "viewType" : "DEGRIDVIEW"
+            },
            "name" : "field9",
+            "getPickupPSAppView" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phonePhoneView.json",
+              "viewType" : "DEGRIDVIEW"
+            },
+            "valueItemName" : "type",
            "enableAC" : true,
            "enablePickupView" : true,
            "forceSelection" : true,
@@ -779,6 +790,7 @@
            "colMD" : 24,
            "layout" : "TABLE_24COL"
          },
+          "valueItemName" : "type",
          "allowEmpty" : true,
          "showCaption" : true
        }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -4940,7 +4940,18 @@
                },
                "editorType" : "PICKER",
                "handlerType" : "PickupText",
+                "getLinkPSAppView" : {
+                  "modelref" : true,
+                  "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+                  "viewType" : "DEGRIDVIEW"
+                },
                "name" : "field9",
+                "getPickupPSAppView" : {
+                  "modelref" : true,
+                  "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phonePhoneView.json",
+                  "viewType" : "DEGRIDVIEW"
+                },
+                "valueItemName" : "type",
                "enableAC" : true,
                "enablePickupView" : true,
                "forceSelection" : true,
@@ -4951,6 +4962,7 @@
                "colMD" : 24,
                "layout" : "TABLE_24COL"
              },
+              "valueItemName" : "type",
              "allowEmpty" : true,
              "showCaption" : true
            }, {