extraFileUpsert

lib/entities/ExtraFile.d.ts

@@ -1,6 +1,6 @@
 import { String, Text } from 'oak-domain/lib/types/DataType';
-import { EntityShape } from 'oak-domain/lib/types/Entity';
-export interface Schema extends EntityShape {
+import { FileCarrierEntityShape } from 'oak-domain/lib/types/Entity';
+export interface Schema extends FileCarrierEntityShape {
     origin: 'qiniu' | 'unknown';
     type: 'image' | 'pdf' | 'video' | 'audio' | 'file';
     bucket: String<16>;

lib/utils/extraFile.d.ts

@@ -1,3 +1,3 @@
 import { OpSchema as ExtraFile } from 'oak-app-domain/ExtraFile/Schema';
-export declare function composeFileUrl(extraFile: ExtraFile): string;
+export declare function composeFileUrl(extraFile: Pick<ExtraFile, 'type' | 'bucket' | 'filename' | 'origin' | 'extra1'>): string;
 export declare function decomposeFileUrl(url: string): Pick<ExtraFile, 'bucket' | 'filename' | 'origin' | 'type' | 'extra1'>;

src/utils/extraFile.ts

@@ -1,6 +1,6 @@
 import { OpSchema as ExtraFile } from 'oak-app-domain/ExtraFile/Schema';
 
-export function composeFileUrl(extraFile: ExtraFile) {
+export function composeFileUrl(extraFile: Pick<ExtraFile, 'type' | 'bucket' | 'filename' | 'origin' | 'extra1'>) {
     const { type, bucket, filename, origin, extra1 } = extraFile;
     if (origin === 'unknown') {
         // 未知第三方源

tsconfig.json

@@ -77,7 +77,7 @@
     "node_modules",
     "**/*.spec.ts",
     "test",
-    "scripts",/* 
-    "wechatMp" */
+    "scripts",
+    "wechatMp"
   ]
 }

wechatMp/components/extraFile/upsert/index.json

@@ -0,0 +1,2 @@
+{
+}

wechatMp/components/extraFile/upsert/index.less

@@ -0,0 +1,5 @@
+/**  index.wxss  **/
+.container {
+  display: block;
+}
+

wechatMp/components/extraFile/upsert/index.ts

@@ -1,17 +1,22 @@
+import assert from 'assert';
 import { WechatMpFileCarrier } from 'oak-frontend-base';
+import { composeFileUrl } from '../../../../src/utils/extraFile';
 OakComponent({
     entity: 'extraFile',
     formData: async (_rows, _features, _fileCarrier) => {
-        return {
-            name: 1,
+        if (_fileCarrier) {
+            return {
+                src: '11',
+            };
+        }
+        else {
+            assert(_rows);
+            return {
+                src: composeFileUrl(_rows[0]!),
+            }
         }
     }
 }, {
     methods: {
-        async onFilePicked() {
-            const fileCarrier = new WechatMpFileCarrier();
-    
-            this.setFileCarrier(fileCarrier);
-        }
     }
 });

wechatMp/components/extraFile/upsert/index.wxml

@@ -0,0 +1,4 @@
+<!-- index.wxml -->
+<view class="container">
+    <image src="{{src}}" mode="aspectFit" />
+</view>

wechatMp/pages/token/me/index.ts

@@ -23,6 +23,7 @@ OakPage({
                     objectId: 1,
                     filename: 1,
                     extra1: 1,
+                    type: 1,
                 },
                 filter: {
                     tag1: 'avatar',

wechatMp/pages/user/manage/detail/index.ts

@@ -21,6 +21,7 @@ OakPage({
                 objectId: 1,
                 filename: 1,
                 extra1: 1,
+                type: 1,
             },
             filter: {
                 tag1: 'avatar',

wechatMp/pages/user/manage/index.ts

@@ -20,6 +20,7 @@ OakPage({
                 objectId: 1,
                 filename: 1,
                 extra1: 1,
+                type: 1,
             },
             filter: {
                 tag1: 'avatar',