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

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.112",
-    "@ibiz-template/core": "^0.0.1-beta.112",
-    "@ibiz-template/model": "^0.0.1-beta.112",
-    "@ibiz-template/runtime": "^0.0.1-beta.112",
-    "@ibiz-template/service": "^0.0.1-beta.112",
-    "@ibiz-template/theme": "^0.0.1-beta.112",
-    "@ibiz-template/vue-util": "^0.0.1-beta.112",
+    "@ibiz-template/controller": "^0.0.1-beta.113",
+    "@ibiz-template/core": "^0.0.1-beta.113",
+    "@ibiz-template/model": "^0.0.1-beta.113",
+    "@ibiz-template/runtime": "^0.0.1-beta.113",
+    "@ibiz-template/service": "^0.0.1-beta.113",
+    "@ibiz-template/theme": "^0.0.1-beta.113",
+    "@ibiz-template/vue-util": "^0.0.1-beta.113",
     "@ibiz/dynamic-model-api": "^2.1.28",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",

app_Web/src/components/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx

@@ -66,14 +66,37 @@ export const IBizImageUpload = defineComponent({
   },
   render() {
     // 编辑态展示
-    return (
-      <div
-        class={[
-          this.ns.b(),
-          this.disabled ? this.ns.m('disabled') : '',
-          this.readonly ? this.ns.m('readonly') : '',
-        ]}
-      >
+    let content = null;
+    if (this.c.model.editorType === 'PICTURE_ONE') {
+      if (this.files[0]) {
+        const item = this.files[0];
+        content = (
+          <div class={this.ns.e('image-upload-list')}>
+            <div key={item.id} class={this.ns.e('list-item')}>
+              <img src={item.url} />
+              <div class={this.ns.e('list-item-cover')}>
+                <i-icon
+                  class={this.ns.e('preview-icon')}
+                  type='ios-eye-outline'
+                  on-click={() => this.onPreview(item)}
+                ></i-icon>
+                <i-icon
+                  class={this.ns.e('download-icon')}
+                  type='ios-download-outline'
+                  on-click={() => this.onDownload(item)}
+                ></i-icon>
+                <i-icon
+                  class={this.ns.e('remove-icon')}
+                  type='ios-trash-outline'
+                  on-click={() => this.onRemove(item)}
+                ></i-icon>
+              </div>
+            </div>
+          </div>
+        );
+      }
+    } else {
+      content = (
         <div class={this.ns.e('image-upload-list')}>
           {this.files.map(item => (
             <div key={item.id} class={this.ns.e('list-item')}>
@@ -98,28 +121,46 @@ export const IBizImageUpload = defineComponent({
             </div>
           ))}
         </div>
-        <i-upload
-          ref='imageUpload'
-          action={this.uploadUrl}
-          headers={this.headers}
-          default-file-list={this.files}
-          multiple={this.c.model.multiple}
-          type={'drag'}
-          accept={this.c.model.accept}
-          show-upload-list={false}
-          before-upload={this.beforeUpload}
-          disabled={this.disabled}
-          props={{
-            'on-success': this.onSuccess,
-            'on-error': this.onError,
-            'on-remove': this.onRemove,
-            'on-preview': this.onDownload,
-          }}
-        >
-          <div class={this.ns.e('btn')}>
-            <i-icon type='ios-add' size='30'></i-icon>
-          </div>
-        </i-upload>
+      );
+    }
+    return (
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+          this.c.style.width || this.c.style.height
+            ? this.ns.m(this.c.model.editorType)
+            : '',
+        ]}
+        style={this.c.style}
+      >
+        {content}
+        {this.c.model.editorType === 'PICTURE_ONE' &&
+        this.files.length >= 1 ? null : (
+          <i-upload
+            ref='imageUpload'
+            action={this.uploadUrl}
+            headers={this.headers}
+            default-file-list={this.files}
+            multiple={this.c.model.multiple}
+            type={'drag'}
+            accept={this.c.model.accept}
+            show-upload-list={false}
+            before-upload={this.beforeUpload}
+            disabled={this.disabled}
+            props={{
+              'on-success': this.onSuccess,
+              'on-error': this.onError,
+              'on-remove': this.onRemove,
+              'on-preview': this.onDownload,
+            }}
+          >
+            <div class={this.ns.e('btn')}>
+              <i-icon type='ios-add' size='30'></i-icon>
+            </div>
+          </i-upload>
+        )}
         <i-modal
           class-name={this.ns.b('modal')}
           footer-hide={true}

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

@@ -1427,16 +1427,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"
       }
     } ]
   }, {

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

@@ -9466,16 +9466,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"
       }
     } ]
   }, {
@@ -9525,41 +9525,34 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
-    }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9603,6 +9596,13 @@
         "id" : "ViewMsg5"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -9630,16 +9630,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],