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

app_Web/packages/ibiz-plugin/src/components/app-preset-rawitem/app-preset-rawitem.vue

@@ -8,6 +8,7 @@
         :content="value"
         :context="context"
         :viewparams="viewparams"
+        :itemValue="value"
     />
     <div class="app-preset-rawitem" v-else-if="type == 'STATIC_VIDEOPLAYER'">
         <app-video :videoParmas="rawParams" />
@@ -34,6 +35,7 @@
 import { Vue, Component, Prop } from 'vue-property-decorator';
 import { ImgurlBase64 } from 'ibiz-core';
 import { Environment } from '@/environments/environment';
+import { IPSEditor } from '@ibiz/dynamic-model-api';
 
 @Component({})
 export default class AppPresetRawitem extends Vue {
@@ -122,6 +124,14 @@ export default class AppPresetRawitem extends Vue {
      */
     @Prop() modelService: any;
 
+   /**
+     * 编辑器实例
+     *
+     * @type {IPSEditor}
+     * @memberof AppPresetRawitem
+     */
+    @Prop() editorInstance!: IPSEditor;
+
     /**
      * 内容类型
      *
@@ -184,7 +194,7 @@ export default class AppPresetRawitem extends Vue {
                 this.handleDynaText();
                 break;
             case 'STATIC_LABEL':
-                this.contentType = 'RAW';
+                this.contentType = this.editorInstance?.editorParams?.['CONTENTTYPE'] || 'RAW';
                 break;
             case 'NAV_POS':
                 break;
@@ -209,7 +219,7 @@ export default class AppPresetRawitem extends Vue {
      * @memberof AppPresetRawitem
      */
     protected handleDynaImg() {
-        this.contentType = 'IMAGE';
+        this.contentType = this.editorInstance?.editorParams?.['CONTENTTYPE'] || 'IMAGE';
         if (this.value && typeof this.value == 'string') {
             // 默认识别文件对象形式，识别失败则为全路径模式
             try {
@@ -233,7 +243,7 @@ export default class AppPresetRawitem extends Vue {
      * @memberof AppPresetRawitem
      */
     protected handleDynaText() {
-        this.contentType = 'RAW';
+        this.contentType = this.editorInstance?.editorParams?.['CONTENTTYPE'] || 'RAW';
     }
 
     /**

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

@@ -50,7 +50,6 @@ export default class AppLang extends Vue {
         const lang: string = this.$i18n.locale;
         const local: any = this.localList.find((_local: any) => Object.is(_local.type, lang));
         this.caption = local.name;
-        document.title = this.title;
     }
 
     /**

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

@@ -301,6 +301,7 @@
             justify-content: flex-start;
             flex-wrap: wrap;
             > .app-middle-menu-item {
+                width: 320px;
                 margin: 12px;
                 cursor: pointer;
                 color: var(--ctrl-font-color);

app_Web/packages/ibiz-vue/src/components/control/view-toolbar/view-toolbar.tsx

@@ -309,6 +309,8 @@ export class ViewToolbar extends Vue {
                     <dropdown transfer transfer-class-name="view-toolbar-transfer" v-show={item.visabled} trigger='click' on-on-click={(name: string) => throttle(this.itemClick,[{ tag: name }],this)}>
                         <el-tooltip disabled={!item.tooltip}>
                             <app-button
+                                showCaption={item.showCaption}
+                                showIcon={item.showIcon}
                                 caption={item.caption}
                                 icon={item.icon}
                                 iconcls={item.iconcls}

app_Web/packages/ibiz-vue/src/control-container/control-container.tsx

@@ -599,6 +599,7 @@ export class ControlContainer extends Vue {
                 const tempModel: any = {
                     name: item.name,
                     showCaption: item.showCaption,
+                    showIcon: item.showIcon,
                     caption: this.$tl((item.getCapPSLanguageRes() as IPSLanguageRes)?.lanResTag, item.caption),
                     tooltip: this.$tl((item.getTooltipPSLanguageRes() as IPSLanguageRes)?.lanResTag, item.tooltip),
                     disabled: false,

app_Web/packages/ibiz-vue/src/view-container/app-indexview-shell.tsx

@@ -96,7 +96,6 @@ export class AppIndexViewShell extends ViewContainerBase {
         if (indexRoute && indexRoute.meta) {
           if (indexView.caption) {
             indexRoute.meta.caption = indexView.caption;
-            document.title = indexView.caption;
           }
           if (indexView.getCapPSLanguageRes()) {
             indexRoute.meta.captionTag = (indexView.getCapPSLanguageRes() as IPSLanguageRes).lanResTag;

app_Web/src/main.ts

@@ -112,6 +112,7 @@ Interceptors.getInstance(router, store);
 let instance:any = null;
 
 const init = async (props:any = {}) => {
+  document.title = Environment.AppTitle;
   const { container } = props;
   instance = new Vue({
       i18n,

app_Web/src/styles/app-style.less

 /***    START:预制按钮行为级别样式类    ***/
 .srfactionlevel50 {
-  color: var(--button-font-color-light) !important;
-  border-color: var(--button-font-color-light) !important;
-  background-color: var(--button-background-color-light) !important;
-}
-
-.srfactionlevel50:disabled {
-  color: var(--button-font-color-light) !important;
-  border-color: var(--button-font-color-light) !important;
-  background-color: var(--button-background-color-light) !important;
-}
-
-.srfactionlevel50:hover {
-  color: var(--button-font-color-bright) !important;
-  border-color: var(--button-font-color-bright) !important;
-  background-color: var(--button-background-color-bright) !important;
-}
-
-.srfactionlevel50:disabled:hover {
-  color: var(--button-font-color-light) !important;
-  border-color: var(--button-font-color-light) !important;
-  background-color: var(--button-background-color-light) !important;
-}
-
-.srfactionlevel100 {
-  color: var(--button-font-color) !important;
-  border-color: var(--button-font-color-light) !important;
-  background-color: var(--button-background-color) !important;
-}
-
-.srfactionlevel100:disabled {
-  color: var(--button-font-color-light) !important;
-  border-color: var(--button-font-color-light) !important;
-  background-color: var(--button-background-color-light) !important;
-}
-
-.srfactionlevel100:hover {
-  color: var(--button-font-color-bright) !important;
-  border-color: var(--button-font-color-bright) !important;
-  background-color: var(--button-background-color-bright) !important;
-}
-
-.srfactionlevel100:disabled:hover {
-  color: var(--button-font-color) !important;
-  border-color: var(--button-font-color-light) !important;
-  background-color: var(--button-background-color) !important;
-}
-
-.srfactionlevel200 {
-  color: var(--button-font-color-bright) !important;
-  border-color: var(--button-font-color-bright) !important;
-  background-color: var(--button-background-color-bright) !important;
-}
-
-.srfactionlevel200:disabled {
-  color: var(--button-font-color-light) !important;
-  border-color: var(--button-font-color-light) !important;
-  background-color: var(--button-background-color-light) !important;
-}
-
-.srfactionlevel200:hover {
-  color: var(--button-font-color-bright) !important;
-  border-color: var(--button-font-color-bright) !important;
-  background-color: var(--button-background-color-bright) !important;
-}
-
-.srfactionlevel200:disabled:hover {
-  color: var(--button-font-color-bright) !important;
-  border-color: var(--button-font-color-bright) !important;
-  background-color: var(--button-background-color-bright) !important;
-}
-
-/***    END:预制按钮行为级别样式类    ***/
-
+    color: var(--button-font-color-light) !important;
+    border-color: var(--button-font-color-light) !important;
+    background-color: var(--button-background-color-light) !important;
+  }
+  
+  .srfactionlevel50:disabled {
+    color: var(--button-font-color-light) !important;
+    border-color: var(--button-font-color-light) !important;
+    background-color: var(--button-background-color-light) !important;
+  }
+  
+  .srfactionlevel50:hover {
+    color: var(--button-font-color-bright) !important;
+    border-color: var(--button-font-color-bright) !important;
+    background-color: var(--button-background-color-bright) !important;
+  }
+  
+  .srfactionlevel50:disabled:hover {
+    color: var(--button-font-color-light) !important;
+    border-color: var(--button-font-color-light) !important;
+    background-color: var(--button-background-color-light) !important;
+  }
+  
+  .srfactionlevel100 {
+    color: var(--button-font-color) !important;
+    border-color: var(--button-font-color-light) !important;
+    background-color: var(--button-background-color) !important;
+  }
+  
+  .srfactionlevel100:disabled {
+    color: var(--button-font-color-light) !important;
+    border-color: var(--button-font-color-light) !important;
+    background-color: var(--button-background-color-light) !important;
+  }
+  
+  .srfactionlevel100:hover {
+    color: var(--button-font-color-bright) !important;
+    border-color: var(--button-font-color-bright) !important;
+    background-color: var(--button-background-color-bright) !important;
+  }
+  
+  .srfactionlevel100:disabled:hover {
+    color: var(--button-font-color) !important;
+    border-color: var(--button-font-color-light) !important;
+    background-color: var(--button-background-color) !important;
+  }
+  
+  .srfactionlevel200 {
+    color: var(--button-font-color-bright) !important;
+    border-color: var(--button-font-color-bright) !important;
+    background-color: var(--button-background-color-bright) !important;
+  }
+  
+  .srfactionlevel200:disabled {
+    color: var(--button-font-color-light) !important;
+    border-color: var(--button-font-color-light) !important;
+    background-color: var(--button-background-color-light) !important;
+  }
+  
+  .srfactionlevel200:hover {
+    color: var(--button-font-color-bright) !important;
+    border-color: var(--button-font-color-bright) !important;
+    background-color: var(--button-background-color-bright) !important;
+  }
+  
+  .srfactionlevel200:disabled:hover {
+    color: var(--button-font-color-bright) !important;
+    border-color: var(--button-font-color-bright) !important;
+    background-color: var(--button-background-color-bright) !important;
+  }
+  
+  /***    END:预制按钮行为级别样式类    ***/
\ No newline at end of file
-/***    START:系统样式表    ***/
-/***    END:系统样式表    ***/
\ No newline at end of file

app_Web/src/utils/auth-guard/auth-guard.ts

 import qs from 'qs';
 import { GlobalHelp, IPSAppView } from '@ibiz/dynamic-model-api';
 import { clearCookie, getCookie, SyncSeriesHook } from 'qx-util';
-import { AppServiceBase, Http, getSessionStorage, setSessionStorage, AppModelService, Util, GetModelService, ViewTool } from 'ibiz-core';
+import { AppServiceBase, Http, getSessionStorage, setSessionStorage, AppModelService, Util, GetModelService, ViewTool, LogUtil } from 'ibiz-core';
 import { AppCenterService, AppNoticeService, AppViewLogicService, NoticeHandler } from 'ibiz-vue';
 import { Environment } from '@/environments/environment';
 import i18n from '@/locale';
@@ -237,10 +237,82 @@ export class AuthGuard {
                 return null;
             }
         }, { lang: Environment?.isEnableMultiLan ? handleLocaleMap(i18n.locale) : '' });
+        await this.initAppStyle('PSSYSAPP.json.css');
         AppServiceBase.getInstance().setAppModelDataObject(service.app);
         AppCenterService.getInstance(router.app.$store);
     }
 
+    /**
+     * 初始化应用样式表
+     * 
+     * @param cssUrl 样式路径
+     */
+    public async initAppStyle(cssUrl: string) {
+        const cssContent = await this.loadAppStyle(cssUrl);
+        if(!cssContent){
+            LogUtil.warn("暂无应用样式表");
+            return;
+        }
+        this.mountedAppStyle(cssContent);
+    }
+
+    /**
+     * 加载应用样式表
+     * 
+     * @param cssUrl 样式路径
+     */
+    public async loadAppStyle(cssUrl: string) {
+        let url = '';
+        if (Environment.bDynamic) {
+            url = `${Environment.remoteDynaPath}/${cssUrl}`;
+            const queryParam = {};
+            const { dynamodeltag } = AppServiceBase.getInstance().getAppStore().getters.getAppData();
+            if (dynamodeltag) {
+                Object.assign(queryParam, { dynamodeltag });
+            }
+            if (queryParam && Object.keys(queryParam).length > 0) {
+                url += `?${qs.stringify(queryParam)}`;
+            }
+        } else {
+            const microAppService = AppServiceBase.getInstance().getMicroAppService();
+            if (microAppService && microAppService.getIsMicroApp() && microAppService.getMicroAppFolder()) {
+                url = `./${microAppService.getMicroAppFolder()}/assets/model/${cssUrl}`;
+            } else {
+                url = `./assets/model/${cssUrl}`;
+            }
+        }
+        try {
+            const result: any = await Http.getInstance().get(url);
+            return result.data ? result.data : null;
+        } catch (error) {
+            return null;
+        }
+    }
+
+    /**
+     * 挂载应用样式表
+     * 
+     * @param cssContent 
+     */
+    public mountedAppStyle(cssContent:string){
+        let appStyleDom:any;
+        for (let i = document.head.childNodes.length - 1; i >= 0; i--) {
+            const children: any = document.head.childNodes[i]
+            if (children.nodeName == "STYLE" && children.getAttribute('title') && children.getAttribute('title') == 'app-style-css') {
+                appStyleDom = children;
+            }
+        }
+        if (appStyleDom) {
+            appStyleDom.innerText = cssContent;
+        } else {
+            const styleDom = document.createElement('style');
+            styleDom.type = "text/css";
+            styleDom.setAttribute('title', 'app-style-css');
+            styleDom.innerText = cssContent;
+            document.head.appendChild(styleDom);
+        }
+    }
+
     /**
      * 处理未登录异常情况
      *

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

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-207-3">
+    <changeSet author="root" id="tab-book-209-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -194,7 +194,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-49-8">
+    <changeSet author="root" id="tab-reginfo-50-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>

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

@@ -262,7 +262,7 @@
           "width" : 899
         },
         "width" : 899.0,
-        "allowEmpty" : true,
+        "allowEmpty" : false,
         "showCaption" : true
       } ],
       "getPSLayout" : {

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

@@ -255,7 +255,7 @@
       "maxLength" : 100,
       "name" : "stuno"
     },
-    "allowEmpty" : true
+    "allowEmpty" : false
   }, {
     "caption" : "学员姓名",
     "codeName" : "name",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json

@@ -1248,7 +1248,7 @@
             "width" : 899
           },
           "width" : 899.0,
-          "allowEmpty" : true,
+          "allowEmpty" : false,
           "showCaption" : true
         } ],
         "getPSLayout" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json

@@ -684,7 +684,7 @@
         "maxLength" : 100,
         "name" : "stuno"
       },
-      "allowEmpty" : true
+      "allowEmpty" : false
     }, {
       "caption" : "学员姓名",
       "codeName" : "name",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -2142,7 +2142,7 @@
             "maxLength" : 100,
             "name" : "stuno"
           },
-          "allowEmpty" : true
+          "allowEmpty" : false
         }, {
           "caption" : "学员姓名",
           "codeName" : "name",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json.css

+/***    START:系统样式表    ***/
+/***    END:系统样式表    ***/
\ No newline at end of file