Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev

lib/components/extraFile/display/index.d.ts

@@ -1 +1,3 @@
-export {};
+/// <reference types="react" />
+declare const _default: import("react").ComponentType<any>;
+export default _default;

lib/components/extraFile/display/index.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+exports.default = OakComponent({
-var mockId_1 = require("oak-frontend-base/lib/utils/mockId");
-var extraFile_1 = require("../../../utils/extraFile");
-OakComponent({
     entity: 'extraFile',
     isList: false,
     projection: {
@@ -17,25 +14,16 @@ OakComponent({
         extension: 1,
         type: 1,
         entity: 1,
+        entityId: 1,
     },
     formData: function (_a) {
         var extraFile = _a.data, features = _a.features;
-        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        return {
-            var application, isTmp;
+            url: features.extraFile.getUrl(extraFile),
-            var _b;
+        };
-            return tslib_1.__generator(this, function (_c) {
+    },
-                switch (_c.label) {
+    wechatMp: {
-                    case 0: return [4 /*yield*/, features.application.getApplication()];
+        externalClasses: ['oak-class'],
-                    case 1:
-                        application = _c.sent();
-                        isTmp = (extraFile === null || extraFile === void 0 ? void 0 : extraFile.id) && (0, mockId_1.isMockId)(extraFile.id);
-                        return [2 /*return*/, {
-                                src: extraFile && (0, extraFile_1.composeFileUrl)(extraFile, (_b = application === null || application === void 0 ? void 0 : application.system) === null || _b === void 0 ? void 0 : _b.config),
-                                isTmp: isTmp,
-                            }];
-                }
-            });
-        });
     },
     properties: {
         // 图片显示模式

lib/components/extraFile/display/index.xml

@@ -1,2 +1,2 @@
 <!-- index.wxml -->
-<image src="{{src}}" mode="{{mode}}" class="image l-class"/>
+<image src="{{url}}" mode="{{mode}}" class="image oak-class"/>

lib/components/extraFile/display/web.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 function render() {
-    return ((0, jsx_runtime_1.jsx)("div", { children: "react" }));
+    return ((0, jsx_runtime_1.jsx)("div", { children: "\u672A\u5B9E\u73B0" }));
 }
 exports.default = render;

lib/components/extraFile/display/web.module.less

@@ -1,9 +1,8 @@
 
 
 .container {
-  height: 100vh;
   display: flex;
   flex-direction: column;
-  justify-content: 'center';
+  justify-content: center;
-  align-items: 'center';
+  align-items: center;
 }

lib/components/extraFile/gallery/index.js

@@ -4,7 +4,6 @@ var tslib_1 = require("tslib");
 var uuid_1 = require("oak-domain/lib/utils/uuid");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var index_1 = tslib_1.__importDefault(require("../../../utils/dialog/index"));
-var extraFile_1 = require("../../../utils/extraFile");
 exports.default = OakComponent({
     entity: 'extraFile',
     isList: true,
@@ -20,6 +19,7 @@ exports.default = OakComponent({
         extension: 1,
         type: 1,
         entity: 1,
+        entityId: 1
     },
     formData: function (_a) {
         var _this = this;
@@ -46,7 +46,7 @@ exports.default = OakComponent({
         itemSizePercentage: '',
     },
     wechatMp: {
-        externalClasses: ['l-class', 'l-item-class'],
+        externalClasses: ['oak-class', 'oak-item-class'],
     },
     properties: {
         removeLater: Boolean,
@@ -321,14 +321,15 @@ exports.default = OakComponent({
         onItemTapped: function (event) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var _a, files, systemConfig, index, imageUrl, urls, detail, result;
+                var _this = this;
                 return tslib_1.__generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             _a = this.state, files = _a.files, systemConfig = _a.systemConfig;
                             index = event.currentTarget.dataset.index;
-                            imageUrl = (0, extraFile_1.composeFileUrl)(files[index], systemConfig);
+                            imageUrl = this.features.extraFile.getUrl(files[index]);
                             urls = files === null || files === void 0 ? void 0 : files.filter(function (ele) { return !!ele; }).map(function (ele) {
-                                return (0, extraFile_1.composeFileUrl)(ele, systemConfig);
+                                return _this.features.extraFile.getUrl(ele);
                             });
                             detail = {
                                 all: files,
@@ -353,41 +354,39 @@ exports.default = OakComponent({
         },
         onDeleteByMp: function (event) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var value, id, bucket, result, confirm_1;
+                var value, id, bucket, origin, result, confirm_1;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             value = event.currentTarget.dataset.value;
-                            id = value.id, bucket = value.bucket;
+                            id = value.id, bucket = value.bucket, origin = value.origin;
-                            if (!(this.props.removeLater || (origin !== 'unknown' && !bucket))) return [3 /*break*/, 2];
+                            if (!(this.props.removeLater || (origin !== 'unknown' && !bucket))) return [3 /*break*/, 1];
-                            return [4 /*yield*/, this.removeItem(id)];
+                            this.removeItem(id);
-                        case 1:
+                            return [3 /*break*/, 4];
-                            _a.sent();
+                        case 1: return [4 /*yield*/, wx.showModal({
-                            return [3 /*break*/, 5];
-                        case 2: return [4 /*yield*/, wx.showModal({
                                 title: '确认删除吗',
                                 content: '删除现有文件',
                             })];
-                        case 3:
+                        case 2:
                             result = _a.sent();
                             confirm_1 = result.confirm;
-                            if (!confirm_1) return [3 /*break*/, 5];
+                            if (!confirm_1) return [3 /*break*/, 4];
                             this.removeItem(id);
                             return [4 /*yield*/, this.execute()];
-                        case 4:
+                        case 3:
                             _a.sent();
-                            _a.label = 5;
+                            _a.label = 4;
-                        case 5: return [2 /*return*/];
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
         },
         onDeleteByWeb: function (value) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var id, bucket, confirm_2;
+                var id, bucket, origin, confirm_2;
                 var _this = this;
                 return tslib_1.__generator(this, function (_a) {
-                    id = value.id, bucket = value.bucket;
+                    id = value.id, bucket = value.bucket, origin = value.origin;
                     // 如果 removeLater为true 或 origin === 'qiniu' 且 bucket不存在
                     if (this.props.removeLater || (origin !== 'unknown' && !bucket)) {
                         this.removeItem(id);

lib/components/extraFile/gallery/index.json

@@ -1,9 +1,7 @@
 {
     "component": true,
     "usingComponents": {
-        "l-icon": "../../../miniprogram_npm/lin-ui/icon/index"
+        "l-icon": "../../../miniprogram_npm/lin-ui/icon/index",
-    },
+        "OakDisplay": "../display/index"
-    "componentGenerics": {
-        "item": true
     }
 }

lib/components/extraFile/gallery/index.xml

@@ -1,15 +1,15 @@
-<view class="file-list__container l-class">
+<view class="file-list__container aok-class">
     <block wx:for="{{files}}" wx:key="index">
         <block wx:if="{{item}}">
-            <view class="file-list__item  file-list__item--{{size}} l-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:'xxx'}}">
+            <view class="file-list__item  file-list__item--{{size}} oak-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:'xxx'}}">
-                <item data-index="{{index}}" bind:tap="onItemTapped" mode="{{mode}}" oakPath="{{oakFullpath}}.{{index}}" />
+                <OakDisplay data-index="{{index}}" bind:tap="onItemTapped" mode="{{mode}}" oakPath="{{oakFullpath}}.{{item.id}}" />
                 <view wx:if="{{!disableDelete}}" mut-bind:tap="onDeleteByMp" class="file-list__remove" data-value="{{item}}">
-                    <t-icon name="close" color="#ffffff" size="18" />
+                    <l-icon name="close" color="#ffffff" size="18" />
                 </view>
             </view>
         </block>
     </block>
-    <view class="file-list__item file-list__item--add  file-list__item--{{size}} l-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:''}}" wx:if="{{!disableInsert}}" bind:tap="onPickByMp">
+    <view class="file-list__item file-list__item--add  file-list__item--{{size}} oak-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:''}}" wx:if="{{!disableInsert}}" bind:tap="onPickByMp">
         <view class="file-list__item-slot-wrapper">
             <slot />
         </view>

lib/components/extraFile/gallery/web.js

@@ -14,8 +14,8 @@ function extraFileToUploadFile(extraFile, systemConfig) {
         id: extraFile.id,
         url: (0, extraFile_1.composeFileUrl)(extraFile, systemConfig),
         thumbUrl: (0, extraFile_1.composeFileUrl)(extraFile, systemConfig),
-        name: extraFile.filename,
+        name: extraFile.filename + (extraFile.extension || ''),
-        fileName: extraFile.filename,
+        fileName: extraFile.filename + (extraFile.extension || ''),
         size: extraFile.size,
         type: extraFile.fileType,
         uid: extraFile.id, //upload 组件需要uid来维护fileList

lib/components/func/debugPanel/web.js

@@ -62,6 +62,8 @@ function render(props) {
                                                 modal.destroy();
                                             },
                                         });
-                                    } }, { children: "Reset" })) }))] }))] }))] }));
+                                    } }, { children: "Reset" })) })), (0, jsx_runtime_1.jsx)(antd_1.Tooltip, tslib_1.__assign({ title: "\u67E5\u770BOakIcon" }, { children: (0, jsx_runtime_1.jsx)(antd_1.Button, tslib_1.__assign({ size: "large", type: "primary", shape: "circle", onClick: function () {
+                                        window.open('/icon');
+                                    } }, { children: "Icon" })) }))] }))] }))] }));
 }
 exports.default = render;

lib/pages/icon/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: import("react").ComponentType<any>;
+export default _default;

lib/pages/icon/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = OakComponent({
+    isList: true,
+    methods: {},
+});

lib/pages/icon/index.json

@@ -0,0 +1,4 @@
+{
+    "navigationBarTitleText": "OakIcon示例",
+    "usingComponents": {}
+}

lib/pages/icon/index.less

@@ -0,0 +1,6 @@
+
+
+.page-body {
+  display: flex;
+}
+

lib/pages/icon/index.xml

@@ -0,0 +1,4 @@
+<!-- index.wxml -->
+<view class="page-body">
+   未实现
+</view>

lib/pages/icon/web.d.ts

@@ -0,0 +1,3 @@
+import { EntityDict } from '../../general-app-domain';
+import { WebComponentProps } from 'oak-frontend-base';
+export default function Render(props: WebComponentProps<EntityDict, 'token', true, {}, {}>): JSX.Element;

lib/pages/icon/web.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var jsx_runtime_1 = require("react/jsx-runtime");
+var web_module_less_1 = tslib_1.__importDefault(require("./web.module.less"));
+function Render(props) {
+    return (0, jsx_runtime_1.jsx)("div", tslib_1.__assign({ className: web_module_less_1.default.container }, { children: "1122" }));
+}
+exports.default = Render;

lib/pages/icon/web.module.less

@@ -0,0 +1,6 @@
+.container {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--oak-bg-color-page);
+}

src/components/extraFile/display/index.ts

@@ -1,37 +1,36 @@
-import { isMockId } from 'oak-frontend-base/lib/utils/mockId';
 import { EntityDict } from '../../../general-app-domain';
-import { composeFileUrl } from '../../../utils/extraFile';
-OakComponent(
-    {
-        entity: 'extraFile',
-        isList: false,
-        projection: {
-            id: 1,
-            tag1: 1,
-            origin: 1,
-            bucket: 1,
-            objectId: 1,
-            filename: 1,
-            extra1: 1,
-            extension: 1,
-            type: 1,
-            entity: 1,
-        },
-        formData: async ({ data: extraFile, features }) => {
-            const application = await features.application.getApplication();
 
-            const isTmp = extraFile?.id && isMockId(extraFile.id);
+export default OakComponent({
-            return {
+    entity: 'extraFile',
-                src: extraFile && composeFileUrl(extraFile as EntityDict['extraFile']['OpSchema'], application?.system?.config),
+    isList: false,
-                isTmp,
+    projection: {
-            };
+        id: 1,
+        tag1: 1,
+        origin: 1,
+        bucket: 1,
+        objectId: 1,
+        filename: 1,
+        extra1: 1,
+        extension: 1,
+        type: 1,
+        entity: 1,
+        entityId: 1,
+    },
+    formData: ({ data: extraFile, features }) => {
+        return {
+            url: features.extraFile.getUrl(
+                extraFile as EntityDict['extraFile']['Schema']
+            ),
+        };
+    },
+    wechatMp: {
+        externalClasses: ['oak-class'],
+    },
+    properties: {
+        // 图片显示模式
+        mode: {
+            type: String,
+            value: 'aspectFit',
         },
-        properties: {
+    },
-            // 图片显示模式
+});
-            mode: {
-                type: String,
-                value: 'aspectFit',
-            },
-        },
-    }
-);

src/components/extraFile/display/index.xml

@@ -1,2 +1,2 @@
 <!-- index.wxml -->
-<image src="{{src}}" mode="{{mode}}" class="image l-class"/>
+<image src="{{url}}" mode="{{mode}}" class="image oak-class"/>

src/components/extraFile/display/web.module.less

@@ -1,9 +1,8 @@
 
 
 .container {
-  height: 100vh;
   display: flex;
   flex-direction: column;
-  justify-content: 'center';
+  justify-content: center;
-  align-items: 'center';
+  align-items: center;
 }

src/components/extraFile/display/web.tsx

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 export default function render() {
     return (
         <div>
-           react
+            未实现
         </div>
     );
 }

src/components/extraFile/gallery/index.json

@@ -1,9 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-      "l-icon": "../../../miniprogram_npm/lin-ui/icon/index"
+      "l-icon": "../../../miniprogram_npm/lin-ui/icon/index",
-  },
+      "OakDisplay": "../display/index"
-  "componentGenerics": {
-    "item": true
   }
 }

src/components/extraFile/gallery/index.ts

@@ -2,7 +2,6 @@ import { generateNewId } from 'oak-domain/lib/utils/uuid';
 import assert from 'assert';
 import Dialog from '../../../utils/dialog/index';
 import { EntityDict } from '../../../general-app-domain';
-import { composeFileUrl } from '../../../utils/extraFile';
 
 export default OakComponent({
     entity: 'extraFile',
@@ -19,6 +18,7 @@ export default OakComponent({
         extension: 1,
         type: 1,
         entity: 1,
+        entityId: 1
     },
     formData({ data: originalFiles, features }) {
         const application = features.application.getApplication();
@@ -45,7 +45,7 @@ export default OakComponent({
         itemSizePercentage: '',
     },
     wechatMp: {
-        externalClasses: ['l-class', 'l-item-class'],
+        externalClasses: ['oak-class', 'oak-item-class'],
     },
     properties: {
         removeLater: Boolean,
@@ -283,11 +283,11 @@ export default OakComponent({
         async onItemTapped(event: WechatMiniprogram.Touch) {
             const { files, systemConfig } = this.state;
             const { index } = event.currentTarget.dataset;
-            const imageUrl = composeFileUrl(files[index]!, systemConfig);
+            const imageUrl = this.features.extraFile.getUrl(files[index]!);
             const urls = files
                 ?.filter((ele: EntityDict['extraFile']['Schema']) => !!ele)
                 .map((ele: EntityDict['extraFile']['Schema']) =>
-                    composeFileUrl(ele!, systemConfig)
+                    this.features.extraFile.getUrl(ele!)
                 );
 
             const detail = {
@@ -308,10 +308,10 @@ export default OakComponent({
         },
         async onDeleteByMp(event: WechatMiniprogram.Touch) {
             const { value } = event.currentTarget.dataset;
-            const { id, bucket } = value;
+            const { id, bucket, origin } = value;
 
             if (this.props.removeLater || (origin !== 'unknown' && !bucket)) {
-                await this.removeItem(id);
+                this.removeItem(id);
             } else {
                 const result = await wx.showModal({
                     title: '确认删除吗',
@@ -325,7 +325,7 @@ export default OakComponent({
             }
         },
         async onDeleteByWeb(value: any) {
-            const { id, bucket } = value;
+            const { id, bucket, origin } = value;
             // 如果 removeLater为true 或 origin === 'qiniu' 且 bucket不存在
             if (this.props.removeLater || (origin !== 'unknown' && !bucket)) {
                 this.removeItem(id);

src/components/extraFile/gallery/index.xml

@@ -1,15 +1,15 @@
-<view class="file-list__container l-class">
+<view class="file-list__container aok-class">
     <block wx:for="{{files}}" wx:key="index">
         <block wx:if="{{item}}">
-            <view class="file-list__item  file-list__item--{{size}} l-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:'xxx'}}">
+            <view class="file-list__item  file-list__item--{{size}} oak-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:'xxx'}}">
-                <item data-index="{{index}}" bind:tap="onItemTapped" mode="{{mode}}" oakPath="{{oakFullpath}}.{{index}}" />
+                <OakDisplay data-index="{{index}}" bind:tap="onItemTapped" mode="{{mode}}" oakPath="{{oakFullpath}}.{{item.id}}" />
                 <view wx:if="{{!disableDelete}}" mut-bind:tap="onDeleteByMp" class="file-list__remove" data-value="{{item}}">
-                    <t-icon name="close" color="#ffffff" size="18" />
+                    <l-icon name="close" color="#ffffff" size="18" />
                 </view>
             </view>
         </block>
     </block>
-    <view class="file-list__item file-list__item--add  file-list__item--{{size}} l-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:''}}" wx:if="{{!disableInsert}}" bind:tap="onPickByMp">
+    <view class="file-list__item file-list__item--add  file-list__item--{{size}} oak-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:''}}" wx:if="{{!disableInsert}}" bind:tap="onPickByMp">
         <view class="file-list__item-slot-wrapper">
             <slot />
         </view>

src/components/extraFile/gallery/web.tsx

@@ -8,7 +8,6 @@ import {
     Tag,
     Button,
     Table,
-    UploadProps,
 } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
@@ -30,8 +29,8 @@ function extraFileToUploadFile(
         id: extraFile.id,
         url: composeFileUrl(extraFile, systemConfig),
         thumbUrl: composeFileUrl(extraFile, systemConfig),
-        name: extraFile.filename,
+        name: extraFile.filename + (extraFile.extension || ''),
-        fileName: extraFile.filename,
+        fileName: extraFile.filename + (extraFile.extension || ''),
         size: extraFile.size!,
         type: extraFile.fileType,
         uid: extraFile.id, //upload 组件需要uid来维护fileList

src/components/func/debugPanel/web.tsx

@@ -175,6 +175,19 @@ export default function render(props: WebComponentProps<EntityDict, 'address', t
                             Reset
                         </Button>
                     </Tooltip>
+
+                    <Tooltip title="查看OakIcon">
+                        <Button
+                            size="large"
+                            type="primary"
+                            shape="circle"
+                            onClick={() => {
+                                window.open('/icon')
+                            }}
+                        >
+                            Icon
+                        </Button>
+                    </Tooltip>
                 </Space>
             </Drawer>
         </React.Fragment>

src/pages/icon/index.json

@@ -0,0 +1,4 @@
+{
+    "navigationBarTitleText": "OakIcon示例",
+    "usingComponents": {}
+}

src/pages/icon/index.less

@@ -0,0 +1,6 @@
+
+
+.page-body {
+  display: flex;
+}
+

src/pages/icon/index.ts

@@ -0,0 +1,6 @@
+
+export default OakComponent({
+    isList: true,
+    methods: {
+    },
+});

src/pages/icon/index.xml

@@ -0,0 +1,4 @@
+<!-- index.wxml -->
+<view class="page-body">
+   未实现
+</view>

src/pages/icon/web.module.less

@@ -0,0 +1,6 @@
+.container {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--oak-bg-color-page);
+}

src/pages/icon/web.tsx

@@ -0,0 +1,15 @@
+import React, { useState } from 'react';
+import { List, Button, Avatar, Input, Drawer } from 'antd';
+import { EntityDict } from '../../general-app-domain';
+import { WebComponentProps } from 'oak-frontend-base';
+
+import Style from './web.module.less';
+
+
+export default function Render(
+    props: WebComponentProps<EntityDict, 'token', true, {}, {}>
+) {
+    return <div className={Style.container}>
+        1122
+    </div>;
+}