ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,256 Commits 2 Branches 0 Tags 129 MiB
6febdb041a
Commit Graph

595 Commits

Author SHA1 Message Date
Junyi
4247c1b255
Doc: api database events (#887) 
* docs: add full sequelize model event types

* feat: update docs

* fix: types

* fix: update docs

* docs: refactor db event apis

* docs: add all events to db api

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-10-14 17:22:32 +08:00
ChengLei Shao
eaea8a7100 feat: limit database identifier (#908) 2022-10-14 15:02:41 +08:00
ChengLei Shao
76f5754e20 fix: sync collection field default value (#907) 2022-10-14 10:04:25 +08:00
chenos
929a4f848a fix(client): tab pane initializers for create form block 2022-10-14 09:48:27 +08:00
chenos
ca2a6fecf0 fix: build error 2022-10-14 09:48:26 +08:00
ChengLei Shao
e6f4db1a73 fix: appends merge includes (#905) 2022-10-13 18:50:55 +08:00
ChengLei Shao
d777fede90 fix: single relation repository appends query issue (#901) 
(cherry picked from commit 20c147701571a14a8ac975287e761801789a8978)
 2022-10-13 12:39:04 +08:00
Junyi
7ca8e562ce feat(plugin-workflow): add concat calculator (#894) 
(cherry picked from commit 7f3f1bc982379ec2d274ca79fb4d6c65664d3c2d)
 2022-10-13 12:38:56 +08:00
lyf-coder
47c1764ac3 fix(client/record-picker): support record-picker show format DataPicker (#888) 
* fix(client/record-picker): support record-picker show format DataPicker

* fix(client/record-picker): undefined judgment and when change field's label refresh format in time

(cherry picked from commit 381e71b1f72a8dd092c9e6ad0c36926102b8a7e2)
 2022-10-13 12:38:15 +08:00
lyf-coder
d6d2e639ce fix(client/block-select-collection): fix select collection menu view error (#889) 
* fix(client/block-select-collection): fix too many collection menu view error

* fix(client/relate-collection-field-menu): fix relate collection field menu view too long error

(cherry picked from commit 6b897f585389ae07a7dcd74cb77705c0e45cacdb)
 2022-10-13 12:38:10 +08:00
chenos
9d947a0fa5 fix: unable to submit form during file upload (#892) 
(cherry picked from commit 54d23e33534cf3656a8a57d57bde018801c5b43b)
 2022-10-13 12:38:03 +08:00
chenos
f6add23da5 feat(collection-manager): inverse fields can be configured (#883) 
* feat: inverse field

* feat: improve code

* feat: translations

* fix: required

(cherry picked from commit 306dca8e5ee1b74562d835a816b72f933465bfb6)

# Conflicts:
#	packages/core/client/src/locale/zh_CN.ts
 2022-10-13 12:37:29 +08:00
chenos
933c3f4463 fix(database): fix the index name too long error 
(cherry picked from commit 7bfe6b8c46bef0183c4703683175561c7fc91aee)
 2022-10-13 12:36:55 +08:00
lyf-coder
7b371706ef fix(formula): support integer and fix NaN error (#879) 
* fix(formula): support integer and fix NaN error

* style(formula-input): remove debugger

(cherry picked from commit 86f24a35ec25d415b5319aba4de7b509774683fd)
 2022-10-13 12:36:46 +08:00
katherinehhh
72372f34e9 fix: sort parameter is missing (#849) 
* fix: 审计日志翻页sort丢失

* fix: 审计日志翻页sort丢失

* fix: 审计日志翻页sort丢失

Co-authored-by: 唐小爱 <tangxiaoai@192.168.0.103>
(cherry picked from commit 88190100cbd64bccaa548de069a727272c04e8f1)
 2022-10-13 12:36:39 +08:00
ChengLei Shao
f490fd358a fix: slow join query issued by appends field in find method of repository (#845) 
* fix: slow join query issue by appends field in repository.find

* feat: handle appending query in multiple relation repository

* feat: handle appending query in single relation repository

Co-authored-by: chenos <chenlinxh@gmail.com>
(cherry picked from commit 9222ff4f0ca92bc554107fccc0cf2a9d6290e56d)

# Conflicts:
#	packages/core/database/src/__tests__/relation-repository/hasone-repository.test.ts
#	packages/core/database/src/repository.ts
 2022-10-13 12:36:20 +08:00
lyf-coder
92fda15efd feat(core/cache): support cache (#876) 
* feat(core/cache): support cache

* build(create-nocobase-app): remove --cache-store-package cli option

* perf(core/cache): modify default cache config and remove unnecessary logic code

(cherry picked from commit 6e6086de7a908f38fe516e5340cb2154229c3843)

# Conflicts:
#	packages/core/server/src/application.ts
#	packages/core/server/src/helper.ts
 2022-10-13 12:24:10 +08:00
ChengLei Shao
3082a7d6f8 feat: update option must have filter or filterByTk (#847) 
* feat: update option must have filter or filterByTk

* fix: typo

* fix: typo

(cherry picked from commit 83e6f93e1e3a188781530ec7492de1ed917a4dc1)

# Conflicts:
#	packages/plugins/acl/src/server.ts
#	packages/plugins/collection-manager/src/__tests__/field-options/indexes.test.ts
 2022-10-13 12:19:05 +08:00
arzanov
ceed13d77e added Russian translation (#840) 
* Russian translation

* Add files via upload

Add RU locale into index.ts
Bugs fixed in the ru_RU.ts

* Update index.ts

Correct lines 4 and 8

(cherry picked from commit 83882d764373afddde9b6183bc0916a1cb8f4743)
 2022-10-13 12:16:15 +08:00
Junyi
e82c1f0243 feat(database): add sequence field type (#779) 
* feat(database): add serialString field type

* feat(database): add serial string type field ui (skip ci)

* test(feat/database): test field options

* docs: demo

* fix(database): fix array table field behavior

* fix(database): fix serial type interface ui

* fix(database): add match logic for patterns changes

* fix(database): fix serial type query last bug in mysql

* refactor(database): refactor last record logic

* chore: revert modification on unnecessary file

* refactor(database): rename serialString type to sequence

Co-authored-by: chenos <chenlinxh@gmail.com>
(cherry picked from commit 32c90b4eec0438696c52ee0562fbf0e4b5af4292)
 2022-10-13 12:15:45 +08:00
chenos
fcccacfdf4 fix: can't access pages without permission via url (#826) 
(cherry picked from commit 92e71c3b01fb63f26ab905249be03a85c546c4bd)
 2022-10-13 12:15:31 +08:00
chenos
5129fc8f46 fix: missing RefreshActionInitializer 
(cherry picked from commit e6340fc23344ea8ff0e3402e686ea1d6f3e79cba)
 2022-10-13 12:15:30 +08:00
chenos
2277e40290 fix(collection-manager): o2m is array type 
(cherry picked from commit 5de69d26ea40d95b732989d3b5d987b7e47541a6)
 2022-10-13 12:15:06 +08:00
chenos
c47f501756 fix: transaction cannot be rolled back because it has been finished with state: rollback 
(cherry picked from commit 6dacec4158103fd165ec2865ea87ed9d3d4ceaa4)
 2022-10-13 12:14:35 +08:00
Junyi
a645dbf5fd
fix: listen promisify (#899) 2022-10-12 21:08:18 +08:00
Junyi
6c929039b1
refactor(core): simplify some code (#895) 2022-10-12 15:22:00 +08:00
chenos
dce6558b55
feat: sample-custom-signup-page (#893) 2022-10-12 12:13:31 +08:00
chenos
d2411f5b63 feat: update docs 2022-10-07 12:11:21 +08:00
chenos
07a1aad784 fix: types error 2022-10-06 17:21:20 +08:00
ChengLei Shao
d805fafbfc
docs: relation repository & acl (#848) 
* docs: relation-repository

* docs: has many repository

* docs: acl

* docs: acl

* docs: acl

* docs: acl

* docs: acl/AllowManager

* docs: acl/ACLAvailableAction

* docs: acl

* docs: clean up

* feat: doc menus

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-10-06 10:29:53 +08:00
chenos
8bf23004a1
refactor: middleware (#857) 
* refactor: middleware

* fix: test error

* fix: test error

* fix: test

* fix: tag
 2022-09-29 21:05:31 +08:00
chenos
a7e6e4716a
feat: add custom page sample and doc (#855) 
* docs: custom ui route sample

* feat: custom page

* fix: remove error

* feat: update doc

* fix: defaultShowCode  true
 2022-09-27 22:50:10 +08:00
chenos
7e929b8f68
fix: auto install a plugin on enable (#852) 2022-09-26 23:47:07 +08:00
chenos
b8fc705df7 fix: pm add error 2022-09-26 15:03:22 +08:00
chenos
50286e2c3c fix: some bugs 2022-09-26 14:52:10 +08:00
chenos
678b6cef21
docs: server application api (#842) 
* feat: update docs

* fix: improve code
 2022-09-23 09:22:17 +08:00
Junyi
796e73ae5a
refactor(doc): change to new structure (#804) 
* refactor(doc): change to new structure

* docs: add database docs

* docs: add collection docs

* docs: add db field examples

* docs(api): fix filename and menu path

* docs: add database docs

* docs: add db operators doc

* docs: add resourcer menu

* docs: add resourcer docs

* docs: fix api docs

* docs: refactor api menu structure

* feat: update docs (#830)

* feat: updates

* feat: update docs

* chore: ignore docs from ci

Co-authored-by: Junyi <mytharcher@users.noreply.github.com>
Co-authored-by: mytharcher <mytharcher@gmail.com>

* docs: add database methods docs

* docs: add missed api

* docs: fix api docs

* feat: update development docs (#833)

* feat: update development docs

* feat: update docs

* feat: update docs

* docs: add first plugin example (#834)

* feat: update docs

* feat: update docs

* docs: fix typo

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-09-19 09:23:01 +08:00
chenos
f9f8dc78f4
refactor: plugin manager (#775) 
* feat: dynamic import plugin client

* refactor: pm

* chore: improve cli

* feat: improve code

* feat: update dependences

* feat: hello plugin

* fix: plugin.enabled

* fix: test error

* feat: improve code

* feat: pm command

* feat: add samples

* fix: redirect

* feat: transitions

* feat: bookmark

* feat: add pm script
 2022-09-18 14:10:01 +08:00
Junyi
1a9cd78eb8
refactor(resourcer): combine middleware class (#825) 
* refactor(resourcer): combine middleware class

* refactor(resourcer): move new middleware to plugin instance
 2022-09-13 23:27:19 +08:00
Junyi
b92f3b3b95
refactor(database): fix some fields and types (#820) 
* refactor(database): fix some fields and types

* fix(database): fix operator ne to null
 2022-09-11 21:58:49 +08:00
chenos
e18b235777 feat: language settings support Japanese 2022-09-09 22:03:49 +08:00
maumii
9d5de42798
feat(locale): added Japanese translation (#813) 
Co-authored-by: mayumi <mayumi@wasp.co.jp>
 2022-09-09 21:46:44 +08:00
chenos
2e8d27bf42
fix: number storage type changed to double (#810) 2022-09-06 11:40:26 +08:00
Junyi
c50a1923f4
refactor(server) (#795) 
* refactor(server): refactor code

* fix(server): fix satisfy check of semver
 2022-09-02 11:44:22 +08:00
chenos
966b4e3459 fix: translation 2022-08-23 09:11:20 +08:00
chenos
86650f16d9 fix: update package versions 2022-08-21 19:29:07 +08:00
chenos
fdfa79cf8f
fix: mysql column in where clause is ambiguous (#756) 
* fix: mysql column in where clause is ambiguous

* feat: add test case

* fix: sqlite error
 2022-08-20 23:24:02 +08:00
Junyi
a1dc139cf4
feat(plugin-cm): add unique option for base fields (#745) 
* feat(plugin-cm): add unique option for base fields

* refactor(plugin-cm): make sure unique constraint sync with field option

* fix(plugin-cm): fix sqlite unique field sync

* fix(plugin-cm): fix unique constraint sync logic

* refactor(plugin-cm): remove unique property for select components

* fix: previous

* fix: test error

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-08-20 23:23:13 +08:00
Junyi
7e6a394f73
feat(plugin-verification): add plugin-verification and phone for users (#722) 
* feat(plugin-verification): add plugin-verification and phone for users

* feat(plugin-verification): add env example

* fix(plugin-verification): fix locales

* fix(plugin-verification): remove sending comment

* fix(plugin-verification): fix i18n

* refactor(plugin-verification): move invalid error message to action

* fix(plugin-verification): add field migration

* chore(plugin-verification): update packages version

* test(plugin-verification): temp remove new package dependency

* refactor(plugin-verification): make sms authentication configurable in system settings

* fix: smsAuthEnabled

* feat: update preset-nocobase

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-08-20 18:06:12 +08:00
chenos
259393f626
feat: resize grid columns with drag and drop (#748) 
* feat: resize grid columns with drag and drop

* fix: column resizing only in designable

* fix: batch patch

* fix: does not scroll when dragging to a blank block

* fix: overflow-x auto
 2022-08-20 18:04:14 +08:00
Junyi
56bd996bd4
refactor(client): split schema-initializer items into multiple files (#744) 2022-08-20 18:03:51 +08:00
chenos
2a18967418
fix: db version check (#749) 
resolve #742
 2022-08-17 23:11:56 +08:00
chenos
28b73d7143
feat: add examples (#718) 
* feat: add examples

* fix: tsconfig-paths/register

* feat: more examples

* fix: test errors

* feat: update examples

* docs: example list

* fix: updates

* feat: example for test case

* feat: api client

* fix: updates

* feat: tree structures

* fix: adjacency-list
 2022-08-16 14:41:29 +08:00
chenos
7fde444a60
chore(versions): 😊 publish v0.7.4-alpha.7 (#740) 2022-08-15 16:12:12 +08:00
chenos
03538ee82f fix(collection-manager): update collection without fields 2022-08-15 13:09:41 +08:00
chenos
a3810ac61a
chore(versions): 😊 publish v0.7.4-alpha.4 (#727) 2022-08-12 10:54:10 +08:00
chenos
458b7a52fb fix(database): error getting db version number 2022-08-12 10:13:12 +08:00
chenos
38c3e3e4cc fix: record provider required for read pretty 2022-08-11 23:48:13 +08:00
SemmyWong
538a28d0bd
fix: sync table sort to export (#723) 2022-08-11 22:22:24 +08:00
chenos
b848b9cd67 feat: add examples 2022-08-08 14:42:48 +08:00
Junyi
0190c573c5
fix(plugin-workflow): fix extend collection (#708) 
* fix(plugin-workflow): fix extend collection

* fix: extendCollection

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-08-04 21:56:13 +08:00
chenos
cec5733260
fix: DB_TABLE_PREFIX doesn't get applied (#710) 
* fix: env DB_TABLE_PREFIX doesn't get applied

* fix: remove before define

* fix: test error

* fix: table prefix

* test: ci

* fix: test error

* test: ci

* test: ci

* fix: test error

* fix: test error

* chore: update node ci
 2022-08-04 21:27:55 +08:00
金昶
f4f35bdb43
feat: default value (#679) 
* feat: default value

* feat: add global default value

* fix: field default value should be updated

* feat: adjust defaultValue logic

* feat: add hasDefaultValue property

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-08-03 09:32:16 +08:00
Ayden
b9fb69c7aa
fix: required field delete submit error (#688) (#694) 2022-08-03 09:06:50 +08:00
chenos
bc12c92091
chore(versions): 😊 publish v0.7.4-alpha.1 (#696) 
* docs: update release notes

* chore(versions): 😊 publish v0.7.4-alpha.1

* feat: update docker image version
 2022-07-28 23:16:17 +08:00
chenos
82cf951166
fix: append roles to current user (#695) 2022-07-28 20:21:31 +08:00
chenos
7d4796e7e0 fix: append roles to user 2022-07-28 18:56:02 +08:00
chenos
609b0e2ff2 fix(client): required for the sub-table field 2022-07-28 17:37:17 +08:00
SemmyWong
165ab2b876
fix: fix date format (#686) 
* fix: fix date format

* fix: fix date format

* fix: export date

* fix: get current timezone

* fix: datetime render

* fix: gmt

* fix: gmt date

* fix: utf offset

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-28 17:32:31 +08:00
SemmyWong
92cd76ce48
fix: fix accuracy of percent (#685) 
* fix: fix accuracy of percent

* fix: fix accuracy of percent

* fix: test unit modify

* fix: export number

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-28 09:26:50 +08:00
chenos
5e1b1170a8 fix: the database only supports MySQL 8.0.17 and above, SQLite 3.x and PostgreSQL 10+ 2022-07-28 09:06:03 +08:00
chenos
827c324be3
feat: uid validate (#681) 2022-07-26 10:07:35 +08:00
chenos
d9b2bf8af1 feat(client): tab icon 2022-07-25 23:25:53 +08:00
chenos
9038d111ea fix(client): fieldNames of RecordPicker 2022-07-25 22:37:20 +08:00
chenos
fad794b647 fix: hide password 2022-07-25 22:31:11 +08:00
Dunqing
c697ef85a6
refactor: replace react-drag-listview with @dnd-kit/sortable (#660) 
* refactor: replace react-drag-listview with @dnd-kit/sortable

* fix: components are different every time

* fix: incorrect border line

* fix: when dragging is enabled for the first time, dragging is invalid

* fix: the items property of SortableContext must be an array of strings

* fix: onRowDragEnd may be non-exists

* fix: incorrect row key

* feat: wrap SortableContext only when dragging is enabled

* fix: improve logic
 2022-07-25 19:34:29 +08:00
Junyi
49a4ab4818
refactor(plugin-users): improve extendibility of middlewares (#677) 
* refactor(plugin-users): improve extendibility of middlewares

* fix(plugin-users): fix typo

* fix: test error

* fix: allowConfigure condition

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-25 19:33:23 +08:00
金昶
5b61587a39
feat: o2m delete not refresh (#646) 
* feat: o2m delete not refresh

* feat: add TableField judgment
 2022-07-25 10:41:28 +08:00
金昶
c86b6f9a06
feat: kanban add description (#659) 
* feat: kanban add description

* fix(client): update translations

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-25 10:40:27 +08:00
SemmyWong
9f7f482aa4
fix: field loss enum (#667) 2022-07-25 09:41:32 +08:00
Neal
73d4b15040
feat: add editor hot key Ctrl+Shift+U (#675) 
* feat: menu tooltip add subtitle

* feat: add editor hot key ctrl+shift+E

* feat: add editor hot key ctrl+shift+E

* feat: add editor hot key ctrl+shift+E

* feat: add editor hot key ctrl+shift+E

* feat: add editor hot key Ctrl+E+D

* feat: add editor hot key Ctrl+Shift+U

Co-authored-by: yangpeng <oncwnuFixr6B9ykxIme1UJHE_1U8@git.weixin.qq.com>
 2022-07-25 09:24:34 +08:00
Neal
54f993f327
fix: Fix calendar change field error (#626) (#671) 
* fix: calendar change field throw error

* fix: calendar change field throw error

* fix: calendar change field throw error

* Update Calendar.Designer.tsx

Co-authored-by: up_young <roc_up_young@163.com>
Co-authored-by: yangpeng <oncwnuFixr6B9ykxIme1UJHE_1U8@git.weixin.qq.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-23 18:19:07 +08:00
Dunqing
cd41eb08ae
chore: fix eslint not work (#670) 2022-07-23 12:30:32 +08:00
金昶
705e6fc743
feat: number precision (#661) 
* feat: number precision

* feat: add test cases

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-22 08:38:35 +08:00
金昶
341114ffd7
feat: form item designer form switch issue (#656) 2022-07-21 22:43:05 +08:00
chenos
22a4f0127d fix: wrong operator 2022-07-21 09:41:01 +08:00
chenos
83f2e19ef3
chore(versions): 😊 publish v0.7.3-alpha.1 (#657) 2022-07-20 15:28:13 +08:00
chenos
75808f92df fix(client): hide modal header 2022-07-20 14:46:55 +08:00
SemmyWong
21619f53c5
feat: print action (#652) 
* feat: print done

* fix: modify print content

* refactor: optimize the print feature

* refactor: change formRef to formBlockRef
 2022-07-20 14:12:18 +08:00
金昶
5d76b996ca
feat: restore action-hooks (#655) 2022-07-20 14:09:58 +08:00
金昶
da52cffb91
feat: collections&fields pagination issue (#653) 2022-07-19 22:52:38 +08:00
Junyi
b215f92ecc
fix(core): change proxied agent methods to native (#654) 2022-07-19 22:51:27 +08:00
金昶
a60759b2eb
feat: remove table field details actions (#638) 2022-07-17 13:30:42 +08:00
金昶
ffff6436ac
fix: link to default value (#641) 
* fix: link to default value

* Update InputRecordPicker.tsx

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-17 13:11:51 +08:00
chenos
600f13f4a0 fix(client): build error 2022-07-16 15:49:34 +08:00
chenos
e2949362ba fix: localStorage is not defined 2022-07-15 20:45:43 +08:00
金昶
9df35933d2
feat: support for displaying relational table fields in details or form blocks (#635) 
* feat: m2o association field

* feat: add ReadPrettyForm support
 2022-07-15 11:31:09 +08:00
金昶
a521231a25
fix: record picker cannot select from different pages (#623) 
related issue #563
 2022-07-15 11:23:54 +08:00
chenos
c51c6c097f feat(client): plugin toolbar icons and translations 2022-07-15 10:50:04 +08:00
Dunqing
0f0f852fa7
fix: dragging an element to the left, right, or bottom would cause the element to disappear (#620) 
* fix: dragging an element to the left, right, or bottom would cause the element to disappear

* fix: remove console

* fix: avoid request api

* Revert "fix: remove console"

This reverts commit 143c9ebc4f14bfba9f1c469e5fb695258861c82c.

* Revert "fix: dragging an element to the left, right, or bottom would cause the element to disappear"

This reverts commit 26c55e22578c34e2947af200c481d312e201ca5a.

* feat: does not hide ColDivider when Bloack length > 1
 2022-07-15 10:39:07 +08:00
Ayden
205c23b656
feat: table action add reload button (#630) 
* feat: table action add reload button

* feat: reload => refresh

* feat: reload icon
 2022-07-14 20:58:21 +08:00
金昶
c9dfc2682c
feat: improve language settings (#627) 
* feat: fix system local setting

* feat: improve language settings

* fix: improve code

* feat: update doc

* feat: add migration

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-14 20:57:26 +08:00
SemmyWong
c8bd2c7317
feat: field assignment for custom actions supports string variables (#597) 
* fix: temporary solution to APP crash

* feat: support dynamic assigned field value

* feat: support dynamic assigned field value

* fix: useFields filter

* fix: dynamic assigned value

* fix: dynamic assigned value

* fix: fix china region export

* fix: fix china region export

* fix: change assign value data

* fix: custom request use parse instead of SchemaCompile

* fix: allow user attribute to be selected

* fix: allow DATE field to be select currentUser or CurrentRecord

* fix: allow DATE field to be select currentUser or CurrentRecord

* fix: change style

* feat: package dependencies

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-13 15:05:46 +08:00
chenos
20ab8c1501 fix(client): blocks are deleted when they are dragged below the current block 2022-07-13 12:52:59 +08:00
chenos
057e1d0039
fix: skip recursive remove on grid component (#621) 
releated issue: #383
 2022-07-12 20:44:21 +08:00
金昶
5f9d5436e7
feat: fix time and collection pagination (#618) 
* feat: fix time and collection pagination

* fix: timepicker read pretty

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-12 15:06:02 +08:00
金昶
8e5334bc9d
feat: recordblockinitializers fields pick (#558) 
Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-11 20:55:38 +08:00
Dunqing
45bcfe241c
fix: incorrectly :active background (#607) 2022-07-11 18:19:57 +08:00
金昶
ef0d60b683
fix: obo table selector (#613) 
Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-11 18:11:27 +08:00
金昶
2282ec1a2d
feat: form validator (#569) 
* feat: form validator

* fix: max can equal min

* feat: adjust input validation rule

* feat: improve field validation

* feat: optimize field validation

* feat: improve field validation

* fix: percent validation

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-07-11 17:23:19 +08:00
金昶
68d35cf597
fix: table selector (#612) 2022-07-10 10:15:12 +08:00
chenos
451d6ae974
chore(versions): 😊 publish v0.7.2-alpha.7 (#611) 
* fix(cli): db sync error
* fix(cli): upgrade error
* feat: update docker image version
 2022-07-10 00:41:36 +08:00
chenos
689a793593 feat(cli): add daemon option to start command 2022-07-09 14:45:47 +08:00
chenos
307c4ca1dc
chore(versions): 😊 publish v0.7.2-alpha.3 (#608) 2022-07-08 11:02:33 +08:00
chenos
654f0380b6
chore(versions): 😊 publish v0.7.2-alpha.2 (#606) 2022-07-07 18:38:30 +08:00
chenos
2bb8fd984f fix(g2plot): import all plots 2022-07-07 18:02:23 +08:00
chenos
a0c021202e
fix: field permissions cannot be saved (#605) 
resolve #599
 2022-07-07 17:46:19 +08:00
chenos
ba5fb97d1e feat: function for chart data request 2022-07-05 16:56:21 +08:00
chenos
7c7fd1bb5e fix(cli): remove process.env.NODE_OPTIONS 2022-07-05 13:10:50 +08:00
chenos
1e7746292f
chore(versions): 😊 publish v0.7.2-alpha.1 (#578) 
* chore(versions): 😊 publish v0.7.2-alpha.1

* feat: update docker image version
 2022-07-05 09:55:22 +08:00
chenos
592f6a423b fix: improve filter item styling 2022-07-04 20:32:18 +08:00
chenos
075426471e fix(collection-manager): missing collection manager context 2022-07-04 20:06:18 +08:00
chenos
e3b6c0513a
feat: filter with variable (#574) 2022-07-04 17:50:18 +08:00
chenos
ec7bc2bc8b
feat(cli): check database version before installation (#572) 
* feat(cli): check database version before installation

* fix: log

* fix: fix bugs

* fix: postgres

* fix: run beforeInstall
 2022-07-04 13:41:07 +08:00
SemmyWong
4e9384bce2
fix(client): comment out useless code 2022-07-01 22:00:00 +08:00
chenos
5603faacf3 fix(cli): app start before sync and upgrade 2022-07-01 09:36:35 +08:00
chenos
9928424f5a feat(client): integer field 2022-07-01 09:35:36 +08:00
chenos
70ab4dcf1f
fix(database): index invalid (#564) 
* fix(database): index invalid

* fix: test error
 2022-07-01 09:33:05 +08:00
chenos
e5793cbbcb fix(client): maximum call stack size exceeded (#554) 2022-06-30 09:22:16 +08:00
Junyi
4a3cb6e65f
Refactor(plugin workflow): move client files into plugin (#556) 
* refactor(plugin-workflow): move client files into plugin

* fix(client): fix package path block build

* test(plugin-workflow): trigger ci
 2022-06-29 23:42:03 +08:00
chenos
d3b157075e
fix(database): constraints default to false (#550) 
* fix(database): constraints default to false

* test(plugin-workflow): skip schedule cases

Co-authored-by: mytharcher <mytharcher@gmail.com>
 2022-06-29 23:20:00 +08:00
chenos
017c6f232d fix(client): cannot read properties of undefined (reading 'target') 2022-06-29 23:04:49 +08:00
chenos
947215f96d fix(client): cannot read properties of undefined (reading 'split') 2022-06-29 22:39:55 +08:00
chenos
008a7f7f33 fix(workflow): merge workflow providers 2022-06-29 17:32:10 +08:00
chenos
0348392037 fix(workflow): load workflow after application initialization 2022-06-29 17:19:10 +08:00
Junyi
8f0ea6c3c0
fix(plugin-workflow): fix select width (#552) 
* fix(plugin-workflow): fix select width

* test(plugin-workflow): skip schedule cases
 2022-06-29 14:30:33 +08:00
金昶
44f23ca920
feat: compatible with old kanban (#553) 
* feat: compatible with old kanban

* feat: replace KanbanV2 to Kanban
 2022-06-29 14:17:42 +08:00
chenos
dbcbe6aea7 fix(client): consider explicitly re-exporting to resolve the ambiguity 2022-06-29 13:14:34 +08:00
金昶
32e744319e
feat: display association fields (#512) 
* feat: association field features

* fix: remove comments

* fix: association field in creation form will trigger error

* fix: column decorator title

* fix: column designer title

* fix: association field in table

* feat: adjust documents

* fix: remove m2o subfield mode

* fix: adjust title field display condition

* fix: relation field title bug

* fix: o2m multiple is true

* feat: association fields are loaded on demand

* fix: support sub field

* feat: remove FormField require config

* fix: two lines in Columns config menu of table block

* fix: could not find schema node

* fix: add form context to internal table block

* fix(client): non-empty judgment

* feat: translations

* fix: add / edit field title compile

* fix: unique

* fix: association feature bugs

* feat: add oho & o2m selector filter

* fix: add field added logic in FormField and TableField

* fix: remove updateAssociationValues middleware

* feat: recordprovider in association fields

* feat: add kanban association appends

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-06-29 12:57:43 +08:00
chenos
839d588892
fix: export of relation blocks (#546) 2022-06-28 19:51:14 +08:00
Junyi
fdb7b4c664
fix(plugin-workflow): clear options when change collection (#547) 2022-06-28 18:48:16 +08:00
Junyi
4a8c9c8d87
feat(plugin-workflow): add race mode (#542) 
* feat(plugin-workflow): add race mode

* fix(plugin-workflow): fix test cases

* fix(plugin-workflow): fix node create action
 2022-06-28 17:00:19 +08:00
Junyi
3e8a80a3ae
fix(client): change toArr to _.castArray in select component (#543) 2022-06-28 10:08:24 +08:00
chenos
a8f951dfab
chore(versions): 😊 publish v0.7.1-alpha.7 (#539) 
* fix(cli): upgrade from docker

* chore(versions): 😊 publish v0.7.1-alpha.6

* fix: export bug

* chore(versions): 😊 publish v0.7.1-alpha.7

* docs: update release notes
 2022-06-26 11:25:13 +08:00
chenos
c9159c6cf4 chore(versions): 😊 publish v0.7.1-alpha.5 2022-06-26 07:36:22 +08:00
chenos
c4c96e5a79 fix(cli): upgrade from docker 2022-06-26 07:35:45 +08:00
chenos
570d039f19 chore(versions): 😊 publish v0.7.1-alpha.4 2022-06-26 07:21:10 +08:00
chenos
cd5bd09c50
chore(create-nocobase-app): fix some bugs (#538) 
* fix: tsconfig

* chore(versions): 😊 publish v0.7.1-alpha.1

* fix: update gitHead

* fix: update gitHead

* chore(versions): 😊 publish v0.7.1-alpha.2

* fix: update client/server entry file

* chore(versions): 😊 publish v0.7.1-alpha.3

* fix: check core dir

* fix: missing core dir

* feat: relationship fields are loaded on demand
 2022-06-26 07:19:03 +08:00
chenos
4184f12457 feat: relationship fields are loaded on demand 2022-06-26 00:27:18 +08:00
chenos
9dae723ca7
fix: destroy collection fields (#536) 2022-06-25 10:36:56 +08:00
Junyi
ef939b4277
feat(plugin-workflow): add delay node type (#532) 
* feat(plugin-workflow): add delay node type

* fix(plugin-workflow): fix test and add cases

* fix(plugin-workflow): fix processor.saveJob()
 2022-06-24 23:28:49 +08:00
chenos
3dce31f6a1
refactor: client application (#533) 
* refactor: client application

* feat: application

* fix: improve code

* fix: app plugin

* fix: app plugin

* fix: china region plugin
 2022-06-24 21:19:57 +08:00
chenos
245bd01bd6
fix: missing transaction (#531) 2022-06-23 23:37:55 +08:00
SemmyWong
33a08288c0
fix: add ellipsis property to record picker (#527) 
* fix: the association fields of table text is overflow

* fix: add m2o ellipsis

* fix: add Kanban ellipsis

* fix: change KanbanV2 to Kanban

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-06-23 22:23:45 +08:00
金昶
e65ed6dfa1
fix: remove pattern without form item (#528) 2022-06-23 16:10:24 +08:00
chenos
4481109b1e fix(client): update only fields in the form 2022-06-23 15:54:07 +08:00
chenos
9314bcd9f2 fix(client): remove z-index 2022-06-23 09:43:22 +08:00
chenos
3f6f510e4f fix(client): non-empty judgment 2022-06-22 23:06:41 +08:00
chenos
22c6591162
fix: order nulls last (#519) 
* fix: order nulls last

* fix: test error

* fix: test error
 2022-06-22 14:25:10 +08:00
chenos
529380fb69 fix(client): close the pop-up after request 2022-06-22 14:10:30 +08:00
SemmyWong
a8ce758cab
fix: action loading, refresh context, form submit and validate (#523) 2022-06-22 13:41:45 +08:00
金昶
88dc2db0f2
Fix field pattern (#520) 
* fix: field pattern

* fix: remove console.log
 2022-06-22 13:41:21 +08:00
Junyi
19987c5846
fix(plugin-workflow): fix searchable select min-width (#524) 2022-06-22 11:13:00 +08:00
金昶
929dd9b22e
fix: template with fields only (#517) 2022-06-22 10:37:18 +08:00
Junyi
2b3f3bd5c3
fix(plugin-workflow): fix update workflow current property (#521) 2022-06-21 21:43:30 +08:00
chenos
151c3a32b8 feat: improve chart component 2022-06-21 11:30:37 +08:00
Junyi
ecf82208eb
refactor(plugin-workflow): abstract to classes (#515) 
* refactor(plugin-workflow): abstract to classes

* fix(plugin-workflow): add indexes and fix cases

* test(plugin-workflow): skip schedule cases
 2022-06-20 23:29:21 +08:00
金昶
553088e839
feat: column sortable and form item pattern (#518) 2022-06-20 16:48:52 +08:00
chenos
2b0c7384f2 feat(client): display option value 2022-06-20 11:57:30 +08:00
chenos
9b6c2ff7ec fix(china-region): typo 2022-06-19 23:22:09 +08:00
chenos
5b5e5c0852 feat(client): hide drawer header 2022-06-19 16:45:20 +08:00
SemmyWong
95c750db15
fix(custom-request): support string/json templates (#514) 
* fix: request api support  dynamic custom

* fix: scope undefined will not work

* fix: use formily compile

* fix: user may be null

* fix: export add context
 2022-06-19 14:06:31 +08:00
chenos
8eec4ac4d1 fix(cli): missing await 2022-06-19 10:30:01 +08:00
金昶
99fdc83dae
feat: add block title (#513) 2022-06-18 20:01:30 +08:00
chenos
72e3f15306
fix: remove collections & fields from db (#511) 
* fix: remove collections & fields from db

* fix: cannot read property 'removeFromDb' of undefined

* test: add test cases

* test: add test cases

* fix: exclude non-deletable fields
 2022-06-18 00:18:12 +08:00
chenos
8514953157 fix(cli): upgrade error in node v14 2022-06-17 14:21:56 +08:00
chenos
34e17004c5
feat: improve migrations (#510) 
* feat: improve upgrade

* feat: addMigrations

* fix: get version

* feat: retry

* feat: migration context

* feat: get the version number from the server
 2022-06-17 10:25:59 +08:00
chenos
1d2b46ea1b docs: update doc 2022-06-17 08:49:08 +08:00
chenos
1c03fbb853 fix(client): improve datepicker component, date with time zone, gmt support 2022-06-16 22:50:09 +08:00
chenos
7a9bab9bab fix: datepicker with timezone 2022-06-16 16:38:12 +08:00
Junyi
bf11cff804
fix(client): consolidate usage of date/time as UTC in transfering (#509) 2022-06-16 16:33:40 +08:00
金昶
e0ed2aeb7c fix: formula bug 2022-06-15 21:28:51 +08:00
chenos
5e116af4a9 fix(plugin-export): allow to configure in acl 2022-06-14 22:04:33 +08:00
chenos
f97b72dc55 fix: sign in/sign up with enter key 2022-06-14 19:09:19 +08:00
chenos
e4352a3769 fix(client): percent precision 2022-06-14 15:56:31 +08:00
金昶
b91ca4420b
feat: association field block (#493) 
* feat: association field block

* feat: association details block

* feat: template add resource name

* feat: add association calendar

* fix: update yarn.lock

* fix: remove useAssociationNames

* fix: restore useFilterByTk logic

* feat: client doc

* fix: resolveNocobasePackagesAlias

* fix: input textarea readpretty

* feat: styling

* fix: oho & obo

* fix: field-summary component remove to collection manager

* fix: translation

* feat: improve code

* fix(audit-logs): skip when collection does not exist

* feat: m2m

* fix: improve code

* fix: title field

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-06-14 15:46:48 +08:00
SemmyWong
d831a9b889
feat: plugin export (#479) 
* feat: init export plugin

* feat: add client export

* fix: fix the word spell

* feat: export plugin done

* feat: init export plugin

* feat: add client export

* fix: fix the word spell

* feat: export plugin done

* ci: change plugin-export version

* refactor: renders add ctx params

* fix: fix select and multipleSelect export

* fix: array convert string

* refactor: move SchemaInitializerPluginProvider

* fix: build error

* fix: change umijs config

* fix: update SchemaInitializerPluginProvider

* fix: import server

* fix: fix some bug

* fix: fix some bug

* refactor: export plugin refactor

* refactor: create all export fields by default

* fix: fix export plugin bug

* fix(plugin-collection-manager): uiSchema toJSON

* fix: update yarn.lock

* fix: fix init fields bug

* refactor: enum params pass by client

* fix: fix export table header title

* refactor: refactor dataIndex

* fix: fix dataIndex maybe complex object

* fix: add checkboxGroup in export plugin

* fix: add checkbox and i18n

* feat: improve code

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-06-14 15:01:53 +08:00
chenos
e69257e346 feat: client doc 2022-06-14 10:56:29 +08:00
Junyi
b033c7214a
fix(client): package path (fix #503) (#504) 2022-06-13 15:00:06 +08:00
金昶
05d315115f
fix: create or delete collection error (#501) 2022-06-11 23:47:40 +08:00
金昶
3496126102
feat: update collections & fields (#500) 
* feat: update collections & fields

* fix: restore phone

* fix: add phone type

* fix: just hide subTable in menu
 2022-06-11 22:25:03 +08:00
chenos
a92a78cc9e
fix: rollback when field creation fails (#498) 
* fix: rollback when field creation fails

* fix: missing transaction
 2022-06-11 20:46:30 +08:00
Junyi
e4b13289d7
fix(client): set dropdownMatchSelectWidth to false globally (#497) 2022-06-10 23:27:35 +08:00
Junyi
9d5e2462d9
fix(client): no-key warning in user menu items (#496) 2022-06-10 22:19:52 +08:00
Junyi
082e27ff10
Feat(plugin workflow): cron field for schedule trigger configuration (#495) 
* feat(plugin-workflow): add cron field component

* refactor(plugin-workflow): break schedule trigger into component files and add locale
 2022-06-10 19:23:26 +08:00
chenos
3fa13d8465
feat: audit logs (#494) 
* feat: audit logs

* feat: improve code

* feat: improve code

* feat: improve code

* feat: improve code

* feat: improve code

* fix: field load
 2022-06-10 17:46:46 +08:00
chenos
d2837740bf fix(client): language settings 2022-06-10 08:38:24 +08:00
chenos
b466b8f6fb feat(client): improve locale 2022-06-10 00:33:59 +08:00
Junyi
7839e78164
refactor(plugin-workflow): add revision column to execution (#491) 2022-06-09 16:40:10 +08:00
chenos
e57e60e6cb feat(client): update locales 2022-06-09 14:43:53 +08:00
金昶
a98213e2cd
feat: relation field uiSchema (#487) 
Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-06-09 12:36:22 +08:00
金昶
1b45f5366c
feat: change FK to input component (#488) 
* feat: change FK to input component

* feat: change FK to input component

* fix: compile label

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-06-09 12:25:09 +08:00
chenos
8583af232d fix: data loaded 2022-06-09 11:12:07 +08:00
chenos
1921b2be31 feat: chart demo 2022-06-09 11:09:03 +08:00
Junyi
78071b4cd8
refactor(database): hook proxy (#402) 
* refactor(database): make db hooks clearly managed by proxy and support named events

* refactor(database): roll back most event logic

* refactor(database): rollback module name

* fix(database): fix test file path

* test: exec order

* fix(database): rollback buildSequelizeHook method

Co-authored-by: chenos <chenlinxh@gmail.com>
 2022-06-08 11:22:08 +08:00
chenos
d96ffde44c
feat: chart blocks (#484) 
* feat: g2plot charts

* feat: improve code

* fix: update yarn.lock
 2022-06-07 21:34:17 +08:00
Junyi
74b9639f6f
Refactor(plugin workflow): support number in repeat config for schedule (#482) 
* refactor(plugin-workflow): change option cron to repeat and allow number type

* refactor(plugin-workflow): support number in repeat config for schedule
 2022-06-07 12:10:39 +08:00
Junyi
588ee21f4d
chore(debug): add debug config (#475) 2022-06-06 23:01:37 +08:00
金昶
fe02557003
fix: has one bug (#478) 2022-06-06 22:59:35 +08:00
chenos
000e4e50b8
feat: relationships (#473) 
* feat: relationship fields

* feat: improve schema
 2022-06-05 22:46:14 +08:00
金昶
7760cd0891
fix: markdown component (#469) 2022-06-05 09:01:27 +08:00
金昶
d6d14459ed
fix: formula field and percent field (#467) 
* fix: formula field & percent field

* fix: percent field

* fix: percent field
 2022-06-04 21:38:08 +08:00
Junyi
bfc686c182
fix(plugin-workflow): fix update workflow action (#464) 2022-06-04 15:44:39 +08:00
金昶
b9ba44f36e
fix: update formula field and percent field (#461) 
* feat: update formula field and percent field

* fix: remove console

* fix: percent component & formula-field
 2022-06-03 22:14:34 +08:00
chenos
7c21c5cf1a fix(client): export useSignin and useSignup 2022-06-02 21:54:18 +08:00
chenos
8298d2a691 fix(cli): yarn install --production error 2022-06-02 14:44:10 +08:00
chenos
5156cda89f fix(client): build error 2022-06-02 14:43:42 +08:00
金昶
efc4301be6
feat: add formula field type (#457) 
* feat: add formula field type

* feat: issue for useCollectionField

* feat: add formula field type

* feat: add formula field type
 2022-06-02 14:33:37 +08:00
chenos
b8fac535f2
fix: the details of the associated data in the subtable are not displayed (#454) 2022-06-02 10:06:49 +08:00
Junyi
a494376f31
fix(plugin-workflow): fix languages (#451) 
* fix(plugin-workflow): fix languages

* test(plugin-workflow): temporarily skip schedule tests
 2022-06-02 00:18:55 +08:00
chenos
75c990adce
fix: afterSync hook not triggered (#450) 2022-06-01 21:37:48 +08:00
chenos
838f4f18dc chore(versions): 😊 publish v0.7.0-alpha.83 2022-06-01 12:49:30 +08:00
chenos
1a5d1f1ebf fix: default value of time zone 2022-06-01 12:25:21 +08:00
chenos
0270553601 fix(database): add timezone support 2022-06-01 11:41:46 +08:00
chenos
94a4d391c7 fix(client): datetime with timezone 2022-05-31 22:49:05 +08:00
SemmyWong
9f6e6f22a6
feat: custom request (#439) 
* feat: custom api request

* fix: fix review problem

* fix: add after request successful tip

* fix: add after request successful tip

* fix: add filterByTk

* fix: add validate

* fix: update locale

* fix: update locale

* fix: update locale

* fix: update locale

* fix: update locale
 2022-05-31 18:56:51 +08:00
Junyi
373c2b9a2d
Feat(plugin workflow): schedule trigger (#438) 
* feat(plugin-workflow): add schedule type trigger

* feat(plugin-workflow): add collection mode for schedule trigger

* feat(plugin-workflow): add ui for schedule trigger configuration

* fix(plugin-workflow): fix test case

* fix(plugin-workflow): fix trigger for sqlite
 2022-05-31 00:00:07 +08:00
chenos
8f70535217
feat: db migrator (#432) 
* feat: db migrator

* feat: modify the test description
 2022-05-30 23:10:32 +08:00
金昶
e51feafe53
fix(client): select component cannot be opened in sub-table block (#431) 2022-05-29 11:52:25 +08:00
chenos
9a64384bc1 fix: error message "error:0308010C:digital envelope routines::unsupported" 2022-05-29 11:44:28 +08:00
Junyi
e286e1bf59
fix(cli): typo (#429) 2022-05-27 21:09:55 +08:00
chenos
4820fd0937 chore(versions): 😊 publish v0.7.0-alpha.82 2022-05-27 00:02:32 +08:00
chenos
4412efc145
feat(client,sdk): improve api client (#425) 
* feat(client,sdk): improve api client

* feat: add test cases

* docs: update doc

* fix(sdk): cannot destructure property 'authClass' of 'instance' as it is undefined
 2022-05-27 00:00:59 +08:00
chenos
735581d20d
feat: add create-plugin command (#423) 
* feat: add create-plugin command

* chore(versions): 😊 publish v0.7.0-alpha.79

* chore(versions): 😊 publish v0.7.0-alpha.80

* chore(versions): 😊 publish v0.7.0-alpha.81
 2022-05-25 23:21:19 +08:00
chenos
c071217fff fix: "typescript": "4.5.5" 2022-05-25 22:23:51 +08:00
SemmyWong
39c254a7db
feat: add button color (#420) 2022-05-25 15:46:17 +08:00
chenos
0b8f3f8bd6 fix(client): filter menu item schema by permissions 2022-05-25 12:09:41 +08:00
chenos
55e6460b0e fix(database): cannot read properties of null (reading 'substring') 2022-05-25 11:49:09 +08:00
chenos
aae11b6e1f fix(client): add description 2022-05-25 10:58:20 +08:00
chenos
c7d7a26938 fix(client): clone schema before insert 2022-05-25 10:31:17 +08:00
chenos
cfd2b50a91 feat(client): add a description to the junction collection field 2022-05-25 10:29:33 +08:00
chenos
45e756c558 fix(devtools): unexpected token '.' 2022-05-24 22:57:32 +08:00
chenos
b1313763e3 chore: unexpected token '.' 2022-05-24 22:55:09 +08:00
chenos
cd39e927b6
chore(versions): 😊 publish v0.7.0-alpha.78 (#419) 
* chore(versions): 😊 publish v0.7.0-alpha.68

* chore(versions): 😊 publish v0.7.0-alpha.69

* chore(versions): 😊 publish v0.7.0-alpha.70

* chore(versions): 😊 publish v0.7.0-alpha.71

* chore(versions): 😊 publish v0.7.0-alpha.72

* chore(versions): 😊 publish v0.7.0-alpha.78
 2022-05-24 19:37:15 +08:00
chenos
326297936b chore(versions): 😊 publish v0.7.0-alpha.67 2022-05-24 15:53:45 +08:00
chenos
9c19e4d67f chore(versions): 😊 publish v0.7.0-alpha.66 2022-05-24 15:52:21 +08:00
chenos
35d01a5fb0 chore(versions): 😊 publish v0.7.0-alpha.64 2022-05-24 15:26:13 +08:00
chenos
c01c6952a5 chore(versions): 😊 publish v0.7.0-alpha.63 2022-05-24 15:10:31 +08:00
chenos
bb4f8d9283 feat(docs): image styling 2022-05-24 15:09:09 +08:00
chenos
d1afb15a7a fix(client): add RemoteDocumentTitleProvider 2022-05-24 15:07:48 +08:00