diff --git a/lib/components/common/tabBar/index.d.ts b/lib/components/common/tabBar/index.d.ts
index 56ba27b4a..79ff742bb 100644
--- a/lib/components/common/tabBar/index.d.ts
+++ b/lib/components/common/tabBar/index.d.ts
@@ -1,23 +1,14 @@
///
declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>;
export default _default;
diff --git a/lib/components/common/tabBar/index.js b/lib/components/common/tabBar/index.js
index bcbec6651..4bea78d50 100644
--- a/lib/components/common/tabBar/index.js
+++ b/lib/components/common/tabBar/index.js
@@ -4,30 +4,21 @@ exports.default = OakComponent({
isList: false,
properties: {
// 背景色
- bgColor: String,
+ bgColor: '',
// 背景图
- bgImg: String,
+ bgImg: '',
// 当前选中索引
- selectedIndex: {
- type: Number,
- value: 0
- },
+ selectedIndex: 0,
// tab 项
list: [],
- color: {
- type: String,
- value: '#666'
- },
- selectedColor: {
- type: String,
- value: ''
- }
+ color: '#666',
+ selectedColor: '',
},
lifetimes: {
show: function () {
// 切换 tab 选中项
this.parseCurrentPage();
- }
+ },
},
data: {
showTabBar: true,
@@ -53,7 +44,7 @@ exports.default = OakComponent({
return;
}
this.setState({
- selectedIndex: index
+ selectedIndex: index,
});
// 触发事件
var item = list[index];
@@ -65,7 +56,10 @@ exports.default = OakComponent({
onTapItem: function (e) {
var index = e.currentTarget.dataset.index;
var url = this.props.list[index].pagePath;
- this.triggerEvent('lintap', { index: index, item: this.props.list[index] });
+ this.triggerEvent('lintap', {
+ index: index,
+ item: this.props.list[index],
+ });
if (!url) {
return;
}
@@ -77,10 +71,10 @@ exports.default = OakComponent({
url: url,
fail: function (error) {
console.warn('路由跳转错误,错误信息为:', error);
- }
+ },
});
- }
+ },
});
- }
- }
+ },
+ },
});
diff --git a/lib/components/func/actionPanel/index.d.ts b/lib/components/func/actionPanel/index.d.ts
index 3cae215b8..7a2859fdf 100644
--- a/lib/components/func/actionPanel/index.d.ts
+++ b/lib/components/func/actionPanel/index.d.ts
@@ -1,6 +1,6 @@
///
declare const _default: (props: import("oak-frontend-base").ReactComponentProps void) | undefined;
actions: string[];
actionDescriptions: any;
iconSize: string;
diff --git a/lib/components/func/actionPanel/index.js b/lib/components/func/actionPanel/index.js
index cfe6cd6d1..4b54398fe 100644
--- a/lib/components/func/actionPanel/index.js
+++ b/lib/components/func/actionPanel/index.js
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.default = OakComponent({
isList: false,
properties: {
- onActionClick: (function () { return undefined; }),
+ onActionClick: undefined,
actions: [],
actionDescriptions: {},
iconSize: '',
diff --git a/lib/pages/login/index.d.ts b/lib/pages/login/index.d.ts
index 0fb862a75..dee28c13c 100644
--- a/lib/pages/login/index.d.ts
+++ b/lib/pages/login/index.d.ts
@@ -1,7 +1,7 @@
///
declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>;
diff --git a/lib/pages/login/index.js b/lib/pages/login/index.js
index bab23d0f2..5e5214778 100644
--- a/lib/pages/login/index.js
+++ b/lib/pages/login/index.js
@@ -21,8 +21,8 @@ exports.default = OakComponent({
loading: false,
},
properties: {
- onlyCaptcha: Boolean,
- onlyPassword: Boolean,
+ onlyCaptcha: false,
+ onlyPassword: false,
eventLoggedIn: '',
backUrl: '', //回调url
},
diff --git a/lib/pages/mobile/login/index.d.ts b/lib/pages/mobile/login/index.d.ts
index 816a887c7..8649cdfc0 100644
--- a/lib/pages/mobile/login/index.d.ts
+++ b/lib/pages/mobile/login/index.d.ts
@@ -1,8 +1,8 @@
///
declare const _default: (props: import("oak-frontend-base").ReactComponentProps void) | undefined;
}>) => import("react").ReactElement>;
export default _default;
diff --git a/lib/pages/mobile/login/index.js b/lib/pages/mobile/login/index.js
index 1f6915cad..e2bd32c4e 100644
--- a/lib/pages/mobile/login/index.js
+++ b/lib/pages/mobile/login/index.js
@@ -17,10 +17,10 @@ exports.default = OakComponent({
password: '',
},
properties: {
- onlyCaptcha: Boolean,
- onlyPassword: Boolean,
+ onlyCaptcha: false,
+ onlyPassword: false,
eventLoggedIn: '',
- callback: (function () { return undefined; }),
+ callback: undefined,
},
formData: function (_a) {
var _this = this;
diff --git a/lib/pages/mobile/me/index.d.ts b/lib/pages/mobile/me/index.d.ts
index 328998594..7587cf673 100644
--- a/lib/pages/mobile/me/index.d.ts
+++ b/lib/pages/mobile/me/index.d.ts
@@ -1,5 +1,5 @@
///
declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>;
export default _default;
diff --git a/lib/pages/mobile/me/index.js b/lib/pages/mobile/me/index.js
index 9f8210bd5..3c1ffeaa6 100644
--- a/lib/pages/mobile/me/index.js
+++ b/lib/pages/mobile/me/index.js
@@ -44,7 +44,7 @@ exports.default = OakComponent({
deleteIdx: undefined,
},
properties: {
- showBack: Boolean,
+ showBack: false,
},
methods: {
onRefreshMobile: function (e) {
diff --git a/lib/pages/userRelation/upsert/byUser/index.d.ts b/lib/pages/userRelation/upsert/byUser/index.d.ts
index c47319b5e..a4ce2d724 100644
--- a/lib/pages/userRelation/upsert/byUser/index.d.ts
+++ b/lib/pages/userRelation/upsert/byUser/index.d.ts
@@ -1,7 +1,8 @@
///
-declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>;
export default _default;
diff --git a/lib/pages/userRelation/upsert/byUser/index.js b/lib/pages/userRelation/upsert/byUser/index.js
index 27770999f..5deac9cce 100644
--- a/lib/pages/userRelation/upsert/byUser/index.js
+++ b/lib/pages/userRelation/upsert/byUser/index.js
@@ -10,9 +10,9 @@ exports.default = OakComponent({
};
},
properties: {
- entity: String,
- entityId: String,
- relations: Array,
+ entity: '',
+ entityId: '',
+ relations: [],
},
methods: {
onConfirm: function () {
@@ -27,6 +27,6 @@ exports.default = OakComponent({
}
});
});
- }
+ },
},
});
diff --git a/lib/pages/wechatPublic/tag/list/index.d.ts b/lib/pages/wechatPublic/tag/list/index.d.ts
index 47f72d39d..4f8d37ff9 100644
--- a/lib/pages/wechatPublic/tag/list/index.d.ts
+++ b/lib/pages/wechatPublic/tag/list/index.d.ts
@@ -1,5 +1,5 @@
///
declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>;
export default _default;
diff --git a/lib/pages/wechatPublic/tag/list/index.js b/lib/pages/wechatPublic/tag/list/index.js
index c95216857..d37db64ea 100644
--- a/lib/pages/wechatPublic/tag/list/index.js
+++ b/lib/pages/wechatPublic/tag/list/index.js
@@ -28,7 +28,7 @@ exports.default = OakComponent({
};
},
properties: {
- applicationId: String,
+ applicationId: '',
},
methods: {
goCreate: function () {
diff --git a/lib/triggers/wechatQrCode.js b/lib/triggers/wechatQrCode.js
index bc72038ae..98f2b44ab 100644
--- a/lib/triggers/wechatQrCode.js
+++ b/lib/triggers/wechatQrCode.js
@@ -226,10 +226,12 @@ var triggers = [
updateData = {
applicationId: appId,
allowShare: true,
- url: url,
expired: false,
expiresAt: permanent ? null : Date.now() + 2592000 * 1000, // wecharQrCode里的过期时间都放到最大,由上层关联对象来主动过期(by Xc, 20230131)
};
+ if (url) {
+ Object.assign(updateData, { url: url });
+ }
if (!wechatQrCode.type) {
Object.assign(updateData, {
type: appType,
diff --git a/src/components/func/actionPanel/index.ts b/src/components/func/actionPanel/index.ts
index 90856aec2..141259189 100644
--- a/src/components/func/actionPanel/index.ts
+++ b/src/components/func/actionPanel/index.ts
@@ -1,7 +1,7 @@
export default OakComponent({
isList: false,
properties: {
- onActionClick: undefined as ((() => void) | undefined),
+ onActionClick: undefined as (((action: string) => void) | undefined),
actions: [] as string[],
actionDescriptions: {} as any,
iconSize: '',
diff --git a/src/triggers/wechatQrCode.ts b/src/triggers/wechatQrCode.ts
index 2bc205de6..e401cb61f 100644
--- a/src/triggers/wechatQrCode.ts
+++ b/src/triggers/wechatQrCode.ts
@@ -248,11 +248,14 @@ const triggers: Trigger[] = [
const updateData = {
applicationId: appId,
allowShare: true,
- url,
expired: false,
expiresAt: permanent ? null : Date.now() + 2592000 * 1000, // wecharQrCode里的过期时间都放到最大,由上层关联对象来主动过期(by Xc, 20230131)
};
+ if (url) {
+ Object.assign(updateData, { url });
+ }
+
if (!wechatQrCode.type) {
Object.assign(
updateData, {