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

352dc293 · ibizdev · ed66b382 · 352dc293 · 352dc293 · 352dc293
--- a/app_Web/package.json
+++ b/app_Web/package.json
@@ -13,13 +13,13 @@
  "dependencies": {
    "@floating-ui/dom": "^1.0.11",
    "@ibiz-template/command": "^0.0.1-beta.50",
-    "@ibiz-template/controller": "^0.0.1-beta.117",
-    "@ibiz-template/core": "^0.0.1-beta.117",
-    "@ibiz-template/model": "^0.0.1-beta.117",
-    "@ibiz-template/runtime": "^0.0.1-beta.117",
-    "@ibiz-template/service": "^0.0.1-beta.117",
-    "@ibiz-template/theme": "^0.0.1-beta.117",
-    "@ibiz-template/vue-util": "^0.0.1-beta.117",
+    "@ibiz-template/controller": "^0.0.1-beta.118",
+    "@ibiz-template/core": "^0.0.1-beta.118",
+    "@ibiz-template/model": "^0.0.1-beta.118",
+    "@ibiz-template/runtime": "^0.0.1-beta.118",
+    "@ibiz-template/service": "^0.0.1-beta.118",
+    "@ibiz-template/theme": "^0.0.1-beta.118",
+    "@ibiz-template/vue-util": "^0.0.1-beta.118",
    "@ibiz/dynamic-model-api": "^2.1.28",
    "@riophae/vue-treeselect": "^0.4.0",
    "dayjs": "^1.11.7",

--- a/app_Web/pnpm-lock.yaml
+++ b/app_Web/pnpm-lock.yaml
--- a/app_Web/src/components/common/code-list/code-list.tsx
+++ b/app_Web/src/components/common/code-list/code-list.tsx
@@ -57,6 +57,7 @@ export const CodeList = defineComponent({
              return {
                text: findItem?.text || val,
                color: findItem?.color,
+                textCls: findItem?.textCls,
              };
            });
          }
@@ -77,7 +78,7 @@ export const CodeList = defineComponent({
          return [
            index !== 0 ? this.codeList?.textSeparator : null,
            <span
-              class={this.ns.e('item')}
+              class={[this.ns.e('item'), item.textCls ? item.textCls : null]}
              style={this.ns.cssVarBlock({
                'item-color': `${item.color}`,
              })}

--- a/app_Web/src/components/common/view-toolbar/view-toolbar.tsx
+++ b/app_Web/src/components/common/view-toolbar/view-toolbar.tsx
@@ -19,7 +19,7 @@ const btnContent = (item: IPSDEToolbarItem, viewMode: string) => {
    if (image) {
      return [showIcon ? <app-icon icon={image} /> : null, item.caption];
    }
-    return [showIcon ? <img src='undefined' /> : null, item.caption];
+    return [null, item.caption];
  }
  return [showIcon ? <app-icon icon={image} /> : null, item.caption];
 };

--- a/app_Web/src/components/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx
+++ b/app_Web/src/components/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx
@@ -176,7 +176,7 @@ export const IBizMPicker = defineComponent({
        .map(item => {
          return item.srfmajortext;
        })
-        .join(',');
+        .join('、');
    });

    const setDefaultOptions = (options: IData[]) => {

--- a/app_Web/src/components/widgets/form-control/form-control.tsx
+++ b/app_Web/src/components/widgets/form-control/form-control.tsx
 import { FormController } from '@ibiz-template/controller';
 import {
+  FormDRUIPartModel,
  FormDetailModel,
  FormGroupPanelModel,
  FormItemModel,
@@ -77,12 +78,20 @@ export const FormControl = defineComponent({
          <div class={this.ns.b()}>
            <form-page modelData={this.c.model}>
              {this.$props.modelData.children.map(page => {
+                const grouppanel = page.children.find(
+                  app => app.source.detailType === 'GROUPPANEL',
+                );
+                const druipart = page.children.find(
+                  app => app.source.detailType === 'DRUIPART',
+                ) as FormDRUIPartModel;
+                const isDruipart = grouppanel && !!druipart;
                return (
                  <form-page-item
                    key={page.id}
                    caption={page.source.caption}
                    model-data={page}
                    controller={this.c.details[page.source.name]}
+                    class={this.ns.is('grouppanel-druipart', isDruipart)}
                  >
                    {page.children.map(detail =>
                      renderByDetailType(h, detail, this.c),

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1432,16 +1432,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {

--- 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
@@ -9664,16 +9664,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {
@@ -9729,16 +9729,16 @@
        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -9751,16 +9751,16 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -9770,16 +9770,17 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
    }, {
@@ -9789,27 +9790,26 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg12"
      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -9818,10 +9818,10 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    } ]
  }, {