适配了新的formdata接口

This commit is contained in:
Xu Chang 2022-05-31 11:29:15 +08:00
parent 75004eb17c
commit 1d76305159
13 changed files with 24 additions and 47 deletions

View File

@ -1,16 +0,0 @@
import assert from 'assert';
import { EntityDict } from 'oak-app-domain';
import { composeFileUrl } from '../../../../src/utils/extraFile';
OakComponent({
entity: 'extraFile',
formData: async (_rows, _features) => {
return {
src: composeFileUrl(_rows[0]!),
}
}
}, {
methods: {
},
lifetimes: {
}
});

View File

@ -1,27 +1,20 @@
<view class="file-list__container l-class">
<block wx:for="{{files}}" wx:key="index">
<view
class="file-list__item file-list__item--{{size}} l-item-class"
style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:'xxx'}}"
>
<item data-index="{{index}}" bind:tap="onItemTapped" mode="{{mode}}" oakValue="{{item}}" oakPath="{{index}}" oakParent="{{oakFullpath}}" />
<view wx:if="{{!disableDelete}}" mut-bind:tap="onDelete" class="file-list__remove" data-value="{{item}}" data-index="{{ index }}">
<g-icon name="clear" color="#ffffff" size="24" />
</view>
</view>
<block wx:if="{{item}}">
<view class="file-list__item file-list__item--{{size}} l-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:'xxx'}}">
<item data-index="{{index}}" bind:tap="onItemTapped" mode="{{mode}}" oakValue="{{item}}" oakPath="{{index}}" oakParent="{{oakFullpath}}" />
<view wx:if="{{!disableDelete}}" mut-bind:tap="onDelete" class="file-list__remove" data-value="{{item}}" data-index="{{ index }}">
<g-icon name="clear" color="#ffffff" size="24" />
</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="onPick"
>
<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="onPick">
<view class="file-list__item-slot-wrapper">
<slot />
</view>
<view class="file-list__image--add">
<g-icon name="add" size="80" />
</view>
<view class="file-list__image--add">
<g-icon name="add" size="80" />
</view>
</view>
</view>

View File

@ -22,8 +22,8 @@ OakPage({
},
},
isList: true,
formData: async (addresses) => ({
addresses: addresses.map(
formData: async ({ data }) => ({
addresses: data.map(
(address) => ({
name: address?.name!,
phone: address?.phone!,

View File

@ -21,7 +21,7 @@ OakPage({
},
},
isList: false,
formData: async ([address]) => ({
formData: async ({ data: address }) => ({
name: address?.name!,
phone: address?.phone!,
// areaName: `${address?.area?.parent.parent.name}${address?.area?.parent.name}${address?.area?.name}`,

View File

@ -9,7 +9,7 @@ OakPage({
mobile: 1,
userId: 1,
},
formData: async (mobiles) => ({
formData: async ({ data: mobiles }) => ({
mobiles,
}),
}, {

View File

@ -18,7 +18,7 @@ OakPage({
}
],
isList: true,
formData: async (arealist) => ({
formData: async ({ data: arealist }) => ({
arealist,
}),
}, {

View File

@ -12,7 +12,7 @@ OakPage({
playerId: 1,
},
isList: true,
formData: async (tokenList, features) => {
formData: async ({ features }) => {
const tokenValue = await features.token.getToken();
if (tokenValue) {
return {

View File

@ -51,7 +51,7 @@ OakPage({
},
}
},
formData: async ([token]) => {
formData: async ({ data: [ token ] }) => {
const user = token?.user;
const player = token?.player;
const avatarFile = user && user.extraFile$entity && user.extraFile$entity[0];

View File

@ -38,7 +38,7 @@ OakPage({
},
},
isList: false,
formData: async ([user]) => {
formData: async ({ data: user }) => {
const { id, nickname, idState, userState, name, mobile$user, extraFile$entity } = user || {};
const mobile = mobile$user && mobile$user[0]?.mobile;
const avatar = extraFile$entity && extraFile$entity[0] && composeFileUrl(extraFile$entity[0]);

View File

@ -37,7 +37,7 @@ OakPage({
},
},
isList: true,
formData: async (users) => {
formData: async ({ data: users }) => {
const userData = users.map(
(user) => {
const { id, nickname, userState, name, mobile$user, extraFile$entity } = user;

View File

@ -33,7 +33,7 @@ OakPage({
idNumber: 1,
},
isList: false,
formData: async ([user]) => {
formData: async ({ data: user }) => {
const { birth, gender, idCardType } = user || {};
const birthText = birth && (new Date(birth)).toLocaleDateString();
const GenderDict = {

View File

@ -31,7 +31,7 @@ OakPage({
},
},
isList: false,
formData: async ([userEntityGrant]) => ({
formData: async ({ data: userEntityGrant}) => ({
relation: userEntityGrant && userEntityGrant.relation,
qrcodeUrl: userEntityGrant && userEntityGrant.wechatQrCode$entity[0]
&& userEntityGrant.wechatQrCode$entity[0].url || 'data:image/jpeg;base64,' + wx.arrayBufferToBase64(userEntityGrant.wechatQrCode$entity[0].buffer)

View File

@ -16,7 +16,7 @@ OakPage({
granteeId: 1,
},
isList: false,
formData: async ([userEntityGrant]) => ({
formData: async ({ data: userEntityGrant }) => ({
...userEntityGrant
}),
}, {