chenos
81819f04e3
chore(versions): 😊 publish v0.11.1-alpha.3
2023-07-26 17:37:20 +08:00
Junyi
80779c3a98
fix(plugin-workflow): fix expression field in sub-form ( #2324 )
2023-07-26 00:38:51 -07:00
YANG QIA
0de4458936
chore: improve FormProvider ( #2322 )
2023-07-26 15:32:59 +08:00
Dunqing
07ff868133
fix: should use filter instead of where ( #2318 )
2023-07-25 21:51:23 +08:00
YANG QIA
78bfcba24f
fix(bi): issue of dnd ( #2315 )
2023-07-25 20:45:01 +08:00
YANG QIA
45bc0b83ba
feat(locale): allows to manage locale resources in core package ( #2293 )
...
* feat(locale): add app.locales
* chore: change directory
* chore: change locale directories
* fix: test
* fix: cached resources changed after sync
* chore: change fr-FR locale directory
2023-07-25 17:09:34 +08:00
Junyi
e27c72e8b0
fix(plugin-workflow): fix styles ( #2316 )
2023-07-25 01:41:42 -07:00
dijoux
a80815c5ad
Feat/translation fr_FR ( #2275 )
...
* feat: client and plugin translation FR
* fix: fr translation
* fix: fr translation
2023-07-25 15:04:35 +08:00
Junyi
df4e6de4dc
fix(plugin-workflow): fix schedule duplicated triggering in multi-apps ( #2313 )
2023-07-24 19:41:54 -07:00
chenos
c84476d805
chore(versions): 😊 publish v0.11.1-alpha.2
2023-07-23 12:44:50 +08:00
Rain
d0528cf1f2
chore(theme-editor): fix deps
2023-07-22 18:26:33 +08:00
Rain
8051e2fc94
chore(theme-editor): fix deps
2023-07-22 18:18:50 +08:00
Rain
25decf0aa9
chore(theme-editor): fix deps
2023-07-22 18:02:35 +08:00
chenos
e979194cf2
chore(versions): 😊 publish v0.11.1-alpha.1
2023-07-22 12:50:04 +08:00
Junyi
5562aca456
fix(plugin-workflow): workflow collections should not appear in blocks ( #2290 )
2023-07-21 01:19:22 -07:00
Rain
8c904363ad
fix(theme-editor): fix color of menu when it is selected
2023-07-21 13:02:19 +08:00
ChengLei Shao
fe2890f9ec
chore: remove belongsToMany through table as collection dependency ( #2289 )
...
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-07-21 12:18:17 +08:00
Rain
8196e164a5
fix(theme-editor): fix color of UI settings and Header
2023-07-21 11:52:46 +08:00
ChengLei Shao
08b2f374c8
feat(database): handle targetCollection option in repository find ( #2175 )
...
* test: return child collection when get with filterByTk
* refactor: targetCollection
* chore: target collection args in repository find
* feat: handle targetCollection option in repository find
* feat: get child target at belongs to many association
* chore: build
* chore: build
* chore: test
* refactor: targetcollection
* test: belongs to association with targetCollection
* fix: test
* fix: test
* fix: test
* fix: test
* fix: test
* feat: update with targetCollection option
* feat: inject target collection options at repository update
---------
Co-authored-by: katherinehhh <katherine_15995@163.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-07-21 10:51:56 +08:00
被雨水过滤的空气-Rain
eb9ee38a2b
feat: add built-in themes ( #2284 )
...
* feat: add built-in themes
* chore: add translation
* fix: should be optional in initial
2023-07-21 10:42:50 +08:00
被雨水过滤的空气-Rain
a4d8ef4b71
docs: add doc for Theme Editor ( #2280 )
...
* docs: add doc for Theme Editor
* chore: update src of img
* chore: increase image height
* chore: optimize img
2023-07-21 10:40:36 +08:00
被雨水过滤的空气-Rain
aab3fafd9b
fix: fix sorting of user menu ( #2288 )
2023-07-21 10:39:58 +08:00
被雨水过滤的空气-Rain
4f5ec0a581
feat(theme-editor): support to config Header's color and Settings button's color ( #2263 )
...
* feat: add color options to theme editor
* feat: add default theme
* refactor: optimize
* feat: support to change color of UI settings
* fix: fix menu background color
* fix: fix color of UI settings
* feat: support to set alpha
* refactor: migrate style to a file
* feat: support colorBgSettingsHover and colorBorderSettingsHover
* feat: adapt settings color
* fix: should be reset together
* feat: compat old theme
2023-07-21 10:38:56 +08:00
Junyi
d587599c8a
feat(plugin-workflow): add sql node ( #2276 )
...
* feat(plugin-workflow): add sql node
* fix(plugin-workflow): fix test cases
2023-07-19 20:04:41 -07:00
chenos
fa2de8e806
fix(theme-editor): remove db.sync
2023-07-20 10:34:09 +08:00
YANG QIA
4e979bc7b7
fix(bi): orderBy bug under MySQL ( #2283 )
...
* fix(bi): orderBy bug under MySQL
* fix: compatible with pgsql
2023-07-19 21:25:49 +08:00
YANG QIA
d80213be5e
fix(bi): eliminate redundancy queries ( #2268 )
...
* fix(bi): eliminate redundancy queries
* fix: reset data after close configure pane
* fix: enum transform bug
* fix: reset form after clicking cancel button
* fix: reset form when changing collection
2023-07-19 16:34:52 +08:00
chenos
2d8451f2dd
fix(s3): missing endpoint
2023-07-19 12:30:40 +08:00
Junyi
a17c1ad4e4
feat(plugin-workflow): allow manual form button to be configured with preset values ( #2225 )
...
* refactor(client): split to small components
* fix(client): fix component warning
* feat(plugin-workflow): allow form button to be configured more than one for each type
* test(plugin-workflow): add test cases
* chore(plugin-workflow): add modal tips
* fix(plugin-workflow): fix test bugs
* fix(plugin-workflow): fix manual button configuration and params
* test(plugin-workflow): fix test cases
* fix(plugin-workflow): fix manual form values
* refactor(plugin-workflow): adjust component
* fix(plugin-workflow): fix typo
* refactor(plugin-workflow): avoid one more load when manual node resume
* fix(plugin-workflow): fix currentUser to be plain object
* chore(plugin-workflow): clean code
* fix(plugin-workflow): fix typo
2023-07-17 21:50:24 -07:00
Junyi
9f8460ca22
feat(plugin-workflow): change to unlimited depth preloading associations in workflow ( #2142 )
...
* refactor(plugin-snapshot): move AppendsTreeSelect component into client package
* refactor(plugin-workflow): change all appends fields select to AppendsTreeSelect
* refactor(plugin-workflow): change appends and toJSON logic on server side
* fix(plugin-workflow): fix toJSON logic and build error
* fix(plugin-workflow): fix missing component injection
* fix(plugin-workflow): fix cycle association in variables
* refactor(client): change AppendsTreeSelect to lazy load
* fix(client): fix lazy load in option
2023-07-17 20:36:17 -07:00
YANG QIA
70d5b9e44b
feat: localization management ( #2210 )
...
* feat: init localization-management
* feat: resource api
* Merge branch 'main' into T-62
* chore: change name
* feat: basic feature
* feat: support filter & sync
* feat: support auto get texts afterSave
* Merge branch 'main' into T-62
* chore: upgrade
* fix: dependency
* fix: field type
* fix: type error
* chore: remove some translations
* feat: support extract text from menu
* chore: cache text keys
* chore: remove test key
* fix: issue of extracting menu titles
* feat: translate collections & fields name
* fix: remove unique of text
* refactor: improve cache
* chore: remove listeners after disable
* chore: translation
* fix: lang switch bug
* refactor: actions & filter
* fix: translation
* refactor: merge lang bundles at backend
* fix: style & field name
* fix: translate issues
* fix: cache bug
* fix: translation merge bug
* fix: translate issues
* fix: map translation
* fix: translation issues
* fix: card title bug
* feat: cover mobile client tabbar
* fix: menu title
* refactor: add locale plugin
* chore: merge locale plugin
* fix: map translation
* chore: remove no data
* style: change button style
* fix: sync bug
* docs: add README
* chore: change name
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-07-17 23:23:44 +08:00
被雨水过滤的空气-Rain
4812cc5692
feat: support custome themes ( #2228 )
...
* feat: create custom-theme plugin
* feat: add custom-theme
* chore: add plugin name and description
* chore: add deps
* chore: optimize deps
* refactor: rename
* chore: add antd-token-previewer
* chore: add deps in plugin
* feat: add theme-editor
* feat: add theme-editor
* feat: add settings
* feat: add theme collection
* refactor: migration to the components folder
* feat: add ThemeList
* refactor: be better
* feat: export createStyles
* feat: implement ThemeCard (T-723)
* style: optimize style
* feat: add ThemeEditorProvider
* feat: add ToEditTheme
* chore: add isBuiltIn field
* feat: implement WYSIWYG
* refactor: migrate i18n
* feat: support to save config
* feat: add validation rule
* refactor: remove useless code
* refactor: optimize GlobalThemeProvider
* feat: add CurrentUserSettingsMenuProvider
* feat: support switching themes
* refactor: migrate CurrentUserProvider to app root
* feat: add InitializeTheme
* fix: fix preview demo
* fix: filter themes
* fix: not valid when editing theme
* fix: should restore the previous theme when closing theme editor
* fix: fix algorithm
* fix: the theme that was just saved should be applied
* refactor: loacl antd-token-previewer
* fix: should be based on the current theme when editing themes
* feat: support to edit theme
* perf: reduce executions
* feat: add animation
* fix: fix the type error of useRequest
* feat: remove built-in themes
* chore: reinstall deps
* fix: fix version of deps
* fix: delete client.d.ts to fix build error
* chore: reinstall deps
* fix: fix build
* fix: fix build
* fix: avoid build errors
* fix: fix crashing
* fix: use value instead of defaultValue
* fix: avoid error
* fix: avoid closure
* fix: fix build
* fix: fix style of login page
* refactor(page): fix style
* fix: fix style of PageHeader
* refactor: fix style of Drawer
* refactor: add FormDialog to loacl
* refactor: fix style of SchemaSettings.ModalItem
* refactor: fix style of pm/Card
* fix: fix text color of pm/Marketplace
* fix: fix table error
* refactor: fix style of collection-manager/summary
* refactor: fix style of fields drawer
* chore: reinstall deps
* fix: fix build
* fix: fix build of custom-theme
* fix: should export Plugin
* refactor: fix style of GraphDrawPage
* chore: upgrade plugin version
* refactor: fix style of Modal by using antd App
* refactor: fix style of FormDialog by using local version
* refactor(workflow): refactor style using antd-style in workflow
* fix(workflow): fix style of workflow
* fix: fix size
* refactor: add --nb-header-height
* feat: remove theme configuration from system settings
* refactor: migrate useUpdateThemeSettings to a new file
* refactor: rename theme to themeId
* feat: add updateSystemThemeSettings
* refactor: migrate utils function
* feat: use localStorage to avoid theme invalid in login page
* fix: fix style of login page
* fix: fix style of Drawer
* feat: optimize style of theme card
* fix: should use a empty object to reset theme
* fix: fix test of Page
* fix: fix test of Application
* fix: change backgroundColor of login page
* fix: fix all style of modal
* fix: fix gap between blocks (T-896)
* fix: fix color of font (T-905)
* fix: fix build
* fix: fix can not scroll in Drawer (T-897)
* fix: fix width of built-in plugins page (T-900)
* fix: fix style of import Modal (T-907)
* fix: fix style of calendar (T-908)
* fix: fix style of kanban (T-909)
* fix: fix style of Gantt (T-910)
* fix: fix style of Collapse (T-915)
* fix: fix style of mobile (T-916)
* fix: fix style of PageHeader (T-958)
* fix: optimize background color of Drawer
* fix: fix style of notification
* fix: fix T-1000
* fix: fix style of LinkageHeader (T-1003)
* fix: fix T-1004
* fix: fix style of scroll bar of chart (T-911)
* fix: fix style of workflow drawer (T-997)
* fix: fix T-922
* fix: fix T-924
* refactor: rename custom-theme to theme-editor
* fix: fix T-999
* fix: fix T-1011
* fix: fix error
* fix: optimize dark mode (T-921)
* fix: fix style of markdown (T-1020)
* fix: fix style of data template (T-1025)
* fix: fix style of rich text (T-1026)
* fix: fix style of a
* fix: fix style of XButton (T-1028)
* fix: fix T-1027
* fix: fix color of variable tag (T-1030)
* chore: translation
* feat: add a modal before create new theme (T-1024)
* feat: highlight card when editing theme (T-1031)
* feat: support to change theme name (T-1023)
* fix: api.auth.getOption('theme')
* fix: fix T-1032
* fix: fix feedback in feishu group
* refactor: code review
* fix: fix test
* chore: rename
* fix: useNotificationMiddleware
* refactor: revert
* fix: fix build
* fix: notification
* refactor: migrate CurrentUserProvider from Application to NocoBaseBuildInPlugin
* fix: fix test
* refactor: fix code review
* chore: avoid test error
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-07-16 12:46:25 +08:00
Junyi
6e637dbb42
chore(plugin-workflow): fix breadcrumb warning ( #2256 )
2023-07-14 22:23:02 -07:00
Junyi
5540a582f0
fix(plugin-workflow): fix request node error in loop ( #2254 )
2023-07-14 18:37:09 +08:00
ChengLei Shao
3510531182
feat(database): view collection support for add new, update and delete actions ( #2119 )
...
* feat: writeableView options in view collection
* refactor: view collection support edit
* refactor: view collection support edit
* refactor: view collection support edit
* refactor: view collection support edit
* test: insert into view with join table
* chore: typo
* chore: package.json
* chore: sql parser
* chore: query interface
* chore: test
* feat: update view collection
* chore: test
* chore: test
* chore: github action pg version
* fix: params in update and delete
* refactor: locale improve
---------
Co-authored-by: katherinehhh <katherine_15995@163.com>
2023-07-14 14:49:12 +08:00
Junyi
b63012d85a
refactor(client): change isTitleField check to interface property titleUsable ( #2250 )
2023-07-14 14:16:44 +08:00
katherinehhh
9b5e923e91
fix: option field display value in workflow todo list ( #2246 )
...
* fix: option field display value in workflowtodo
* refactor: code improve
* refactor: code improve
2023-07-13 22:08:00 -07:00
Junyi
01db49a089
fix(plugin-workflow): fix dispatch bug ( #2247 )
2023-07-13 23:14:25 +08:00
Junyi
5638a2fa2b
fix(plugin-workflow): fix job button style ( #2243 )
2023-07-12 22:32:00 -07:00
被雨水过滤的空气-Rairn
57507b310e
fix: should auto focus in drop-down menu ( #2234 )
...
* fix: should auto focus in drop-down menu
* fix: fix error in console
2023-07-12 08:39:19 +08:00
Junyi
05058c04b6
fix(plugin-fm): adjust upload file size to 1G which same as default on server side ( #2236 )
...
Close #2215 .
2023-07-11 08:47:57 -07:00
chenos
c0a59524ab
chore(versions): 😊 publish v0.11.0-alpha.1
2023-07-08 08:29:33 +08:00
被雨水过滤的空气-Rairn
fd36c970bc
refactor(client)!: upgrade antd to v5 ( #2078 )
...
* refactor: change moment to dayjs
* refactor: remove antd css
* refactor: change @formily/antd to @formily/antd-v5
* chore: add dep
* chore: upgrade babel/core and typescript
* refactor: rename moment to dayjs
* fix(dayjs): add plugins
* refactor: fix type errors
* refactor: change default export to named export
* chore: upgrade ts-loader
* refactor: rename moment to dayjs
* refactor: fix type errors
* chore: upgrade deps for build
* fix: fix build errors
* fix: add antd reset css
* fix: fix build error
* chore: add __builtins__
* chore: optimize genStyleHook
* refactor(Calendar): less to css-in-js
* refactor(acl): less to css-in-js
* refactor(board): less to css-in-js
* chore: add antd-style
* refactor(acl): use antd-style
* refactor(board): use antd-style
* refactor: schema-initializer
* refactor: refactor genStyleHook
* refactor: kanban
* refactor: filter
* refactor: upload
* refactor: markdown
* refactor: rename className to componentCls
* refactor: rich-text
* style: fix style
* fix: fix merge error
* chore: update yarn.lock
* chore: upgrade formily
* style: fix pageHeader
* style: fix add button style
* style: fix header menu color
* chore: update yarn.lock
* chore: upgrade deps
* test: fix tests
* test: fix tests
* fix: fix build error
* fix: fix style of plugin doc
* fix: fix tests
* fix: fix drag bug
* refactor: remove useless code
* fix: fix Modal style (T-621)
* fix: fix box-shadow of subMenu (T-622)
* fix: fix style of linkage rules (T-623)
* fix: fix style of DataTemplate
* fix: fix style of variable (T-620)
* chore: update yarn.lock
* fix: avoid test failed
* test: fix error
* chore: update yarn.lock
* test: fix error
* test(dayjs): fix error
* fix: should delay show menu to avoid the menu not hidden
* test: skip failure test
* fix(mouseEnterDelay): change default value from 100 to 150
* test: avoid failed
* refactor: rename component names
* chore: optimize types
* chore: lock antd version
* fix: fix build
* fix: fix build
* fix: layout bg color use variable
* fix: fix style of buttons
* feat: remove theme config
* fix(calendar): fix style
* fix(mobile-client): fix dialog style
* fix: fix test
* refactor: make code gooder
* chore: change code
* fix: fix T-847
* fix: fix T-845
* fix: display block
* fix: danger button
* refactor: make tester better
* fix: change moment to dayjs
* fix: build error
* fix: import dayjs/plugin/isSameOrBefore
* refactor: downgrade @testing-library/react to fix warning
* fix: fix CI
* fix: upgrade deps to fix build
* fix: fix test
* fix: skip some filed tests to avoid error
* fix: fix build errors that maked by merge code
* refactor: remove moment
* fix: error
* feat: update doc
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-07-08 08:26:27 +08:00
Junyi
6b220c342c
fix(plugin-workflow): fix loop variable ( #2211 )
2023-07-07 07:51:44 -07:00
Junyi
6c19dad23d
chore(plugin-workflow): adjust types ( #2206 )
...
* chore(plugin-workflow): adjust types
* fix(plugin-workflow): fix types
2023-07-07 02:59:46 -07:00
jack zhang
2cb1203aa4
refactor(client)!: application, router and plugin ( #2068 )
...
BREAKING CHANGE:
* refactor: update umi version 3.x to version 4.x
* refactor: update react-router-dom version to 6.x
* refactor(react-router-dom): change Layout Component `props.children` to `<Outlet />`
* refactor(react-router-dom): change <Route /> props and <RouteSwitch /> correct
* refactor(react-router-dom): replace `<Redirect />` to `<Navigate replace />`
* refactor(react-router-dom): replace `useHistory` to `useNavigate`
* refactor(react-router-dom): replace `useRouteMatch` to `useParams`
* refactor(react-router-dom & dumi): fix <RouteSwitch /> & umi document bug
* refactor(react-router-dom): `useRoutes` Optimize `<RouteSwitch />` code
* refactor(react-router-dom): update `Route` types and docs
* refactor(react-router-dom): optimize RouteSwitch code
* refactor(react-router-dom): `useLocation` no generics type
* refactor(react-router-dom): add `less v3.9.0` to `resolutions` to solve the error of `gulp-less`
* refactor(react-router-dom): fix `<RouteSwitch />` `props.routes` as an array is not handled
* chore: upgrade `dumi` and refactor docs
* fix: completed code review, add `targets` to solve browser compatibility & removed `chainWebpack`
* refactor(dumi): upgraded dumi under `packages/core/client`
* refactor(dumi): delete `packages/core/dumi-theme-nocobase`
* refactor(dumi): degrade `react` & replace `dumi-theme-antd` to `dumi-theme-nocobase`
* refactor(dumi): solve conflicts between multiple dumi applications
* fix: login page error in react 17
* refactor(dumi): remove less resolutions
* refactor(dumi): umi add `msfu: true` config
* fix: merge bug
* fix: self code review
* fix: code reivew and test bug
* refactor: upgrade react to 18
* refactor: degrade react types to 17
* chore: fix ci error
* fix: support routerBase & fix workflow page params
* fix(doc): menu externel link
* fix: build error
* fix: delete
* fix: vitest error
* fix: react-router new code replace
* fix: vitest markdown error
* fix: title is none when refresh
* fix: merge error
* fix: sidebar width is wrong
* fix: useProps error
* fix: side-menu-width
* fix: menu selectId is wrong & useProps is string
* fix: menu selected first default & side menu hide when change
* fix: test error & v0.10 change log
* fix: new compnent doc modify
* fix: set umi `fastRefresh=false`
* refactor: application v2
* fix: improve code
* fix: bug
* fix: page = 0 error
* fix: workflow navigate error
* feat: plugin manager
* fix: afterAdd
* feat: complete basic functional refactor
* fix: performance Application
* feat: support client and server build
* refactor: nocobase build-in plugin and providers
* fix: server can't start
* refactor: all plugins package `Prodiver` change to `Plugin`
* feat: nested router and change mobile client
* feat: delete application-v1 and router-switch
* feat: improve routes
* fix: change mobile not nested
* feat: delete RouteSwitchContext and change buildin Provider to Plugin
* feat: delete RouteSwitchContext plugins
* fix: refactor SchemaComponentOptions
* feat: improve SchemaComponentOptions
* fix: add useAdminSchemaUid
* fix: merge master error
* fix: vitest error
* fix: bug
* feat: bugs
* fix: improve code
* fix: restore code
* feat: vitest
* fix: bugs
* fix: bugs
* docs: update doc
* feat: improve code
* feat: add docs and imporve code
* fix: bugs
* feat: add tests
* fix: remove deps
* fix: muti app router error
* fix: router error
* fix: workflow error
* fix: cli error
* feat: change NoCobase -> Nocobase
* fix: code review
* fix: type error
* fix: cli error and plugin demo
* feat: update doc theme
* fix: build error
* fix: mobile router
* fix: code rewview
* fix: bug
* fix: test bug
* fix: bug
* refactor: add the "client" directory to all plugins
* refactor: modify samples client and plugin template
* fix: merge error
* fix: add files in package.json
* refactor: add README to files in package.json
* fix: adjust plugins depencies
* refactor: completing plugins' devDependencies and dependencies
* fix: bug
* refactor: remove @emotion/css
* refactor: jsonwebtoken deps
* refactor: remove sequelize
* refactor: dayjs and moment deps
* fix: bugs
* fix: bug
* fix: cycle detect
* fix: merge bug
* feat: new plugin bug
* fix: lang bug
* fix: dynamic import bug
* refactor: plugins and example add father config
* feat: improve code
* fix: add AppSpin and AppError components
* Revert "refactor: plugins and example add father config"
This reverts commit 483315bca5524e4b8cbbb20cbad77986f081089d.
# Conflicts:
# packages/plugins/auth/package.json
# packages/plugins/multi-app-manager/package.json
# packages/samples/command/package.json
# packages/samples/custom-collection-template/package.json
# packages/samples/ratelimit/package.json
# packages/samples/shop-actions/package.json
# packages/samples/shop-events/package.json
# packages/samples/shop-modeling/package.json
* feat: update doc
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-07-07 14:35:22 +08:00
Junyi
50786621bb
fix(plugin-workflow): try to avoid occasionally duplicated executions ( #2196 )
...
* fix(plugin-workflow): try to avoid occasionally duplicated executions
* test(plugin-workflow): avoid appends error and add more test cases
* test(plugin-workflow): fix type and adjust waiting time for test cases
* fix(plugin-workflow): refactor delay logic and fix failed cases
2023-07-06 23:07:05 -07:00
chenos
15f028295c
chore(versions): 😊 publish v0.10.1-alpha.1
2023-07-07 06:56:04 +08:00
Dunqing
817646d68d
feat(api-keys): the expiration field support custom option ( #2186 )
...
* feat(api-keys): the expiration field support custom option
* feat: support never option
* feat: support if expiresIn = never the expiresIn will replace to 1000y
* fix: toggle datepicker
* feat: update syntax
* fix: option order
* docs: update
* fix: maskCloseable should be false
* refactor: performance and remove unused code
* feat: should not allow clear
* fix: decode maybe fail
* fix: i18n
2023-07-06 16:33:28 +08:00
Junyi
dc91d44ce6
refactor(plugin-workflow): refactor nodes variable option api ( #2192 )
2023-07-05 21:27:34 -07:00
Junyi
c9b726916c
refactor(client): refactor variable components and variables in workflow ( #2157 )
...
* refactor(plugin-workflow): change collection variables to lazy load
* fix(plugin-workflow): avoid to-many reverse loading for association field
* fix(client): fix variable components
* chore(client): fix type
* fix(client): fix current user lazy load options
* refactor(client): remove compile from variable components which potencially causing bug
* fix(plugin-workflow): fix scope argument for new api
* fix(client): fix constant type options
* fix(client): fix infinity rerendering
* fix: avoid closure problem
* fix(client): should use no children when lazy load
* refactor(client): refactor AssignedField to use Variable component
* fix(client): fix type
* fix(plugin-workflow): fix variable options in some node not changes
* fix(plugin-workflow): fix select variable for operand crash (T-815)
* fix(plugin-workflow): variable types detect
* fix(plugin-workflow): detect association to match types
* fix(plugin-workflow): fix variable type filter logic
* fix(plugin-workflow): fix optional types
* fix(plugin-workflow): make changeOnSelect configurable in TextArea and JSONInput
---------
Co-authored-by: Rairn <958414905@qq.com>
2023-07-05 07:01:41 -07:00
Dunqing
25a3a8affa
feat: support token blacklist ( #2168 )
...
* feat: support token blacklist, Close T-799
* feat: clean
* fix: possible token does not exist
* fix: update
* feat: update
* feat: add node-cron to delete expired token
* fix: findOrCreate not work and add test case
* test: add token-blacklist tests
* feat: add test cases for blacklist in authManager
* test: update better
* fix: should hidden token field
* test: clean
* test: clean
* fix: should stop cron in afterStop
* refactor: move delete expired token in token blacklist service
* feat: remove plugin disable/enable logic
* fix: clean
* test: revert
* fix: cron typo
2023-07-05 21:57:57 +08:00
katherinehhh
046a0b4f4d
feat(collection-manager): tableOID field and collection field ( #2161 )
...
* feat: support tableOid interface
* chore: child collection filter operator
* chore: test
* refactor: support tableOid and collection field
* chore: test
* fix: refactor: collectionSelect
* refactor: support linkage from form in add child
* refactor: add child support linkage form form
* refactor: code improve
* feat: support undefined value in childIn query
* chore: test
* refactor: locale improve
* refactor: code improve
* refactor: code improve
* refactor: tableoid only support pg
* refactor: tableoid only support pg
* refactor: code improve
* refactor: collection operator
* refactor: code improve
* refactor: code improve
* refactor: code improve
* refactor: code improve
* refactor: collection field support options config
* refactor: collection field support options config
* feat: tableoid migration
* fix: item.options?.inherits
---------
Co-authored-by: ChengLei Shao <chareice@live.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-07-04 23:16:49 +08:00
Junyi
650a580aca
fix(plugin-workflow): fix data scope on todo table block ( #2176 )
2023-07-04 16:05:50 +08:00
Junyi
21371aaa57
fix(plugin-workflow): fix cancel action on trigger config ( #2166 )
2023-07-02 17:02:05 -07:00
Dunqing
677442c844
fix(plugin-api-keys): use currentRoles instead of get roles from roles:list ( #2163 )
2023-07-02 10:36:36 +08:00
Dunqing
9f4fc777b0
docs: update api-keys related documentation ( #2162 )
...
* docs: typo
* docs: update
2023-07-01 12:21:33 +08:00
YANG QIA
3aa65cb30c
feat: data visualization ( #2160 )
...
* feat(charts-v2): init
* chore(charts-v2): init chart renderer
* feat(chart-v2): add chart grid and initializer
* feat(chart-v2): improve ui
* feat(chart-v2): ui
* feat(charts-v2): query sort ui
* feat(charts-v2): field select component
* feat(charts-v2): improve ui && add query action
* feat(charts-v2): imporve ui, work in progress
* fix(charts-v2): chart renderer request api twice
* feat(charts-v2): add dimension formatter
* feat(charts-v2): filter, sort, limit
* feat(charts-v2): sql mode ui
* feat(charts-v2): support duplicate & sql mode
* fix(charts-v2): wrong defaultValue of json config
* feat(charts-v2): transformer ui
* feat(charts-v2): transformer
* chore(charts-v2): rename transfromer to transform
* feat(charts-v2): support cache
* feat(charts-v2): add acl provider
* chore(charts-v2): hide sql mode
* refactor(charts-v2): add renderer provider
* feat: collection permission check
* feat(charts-v2): add antd statistic
* test(charts-v2): backend
* chore: improve code
* test(charts-v2): add test
* chore: add Chinese translation
* fix(charts-v2): locale switch bug
* chore: add dependency
* feat(charts-v2): init chart config from query
* feat: change layout
* test: fix frontend test
* feat: improve auto infer
* fix: ui issues
* chore: translation
* fix: sql error
* fix: some issues
* feat: support table
* fix: bug
* chore: improve code and fix query
* feat: add config reference
* chore: add translation
* fix: process data due to pg issue
* test: fix parseBuilder
* chore: upgrade formily to 2.2.25
* fix: some issues and import style
* fix: bug when query with sort
* feat: parse enum data
* fix: yarn.lock
* fix: type error
* fix: infer bug and frontend test
* test: fix frontend
* fix: test
* feat: improve preview
* chore: downgrade formily
* feat: support associations, draft, in testing
* fix: typo
* test: frontend & backend
* fix: infer bug
* feat: measure selection of statistics
* fix: bug of group by alias
* fix: some issues
* fix: order issues
* fix: yarn.lock
* chore: fix filter include & 'data-visualization'
* style: improve style
* docs: add readme
* chore: add translation
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-06-30 20:49:44 +08:00
chenos
7e0ac57057
fix(acl): add roles.users field
2023-06-30 12:02:08 +08:00
Dunqing
6cfd586175
feat(plugin-api-keys): support fetch api via api-keys ( #2136 )
...
* feat(plugin-api-keys): support fetch api via api-keys
* feat: full support
* fix: missing parseToken in auth
* feat: add created at column
* feat: configure snippet
* fix: remove unused code
* fix: revert
* chore: update deps
* feat: improve role
* fix: avoid create api key without not exist role
* feat: improve select roles
* refactor: when no X-Role is found, roles should not be randomly assigned
* feat: improve code
* feat: improve current role
* fix: revert
* fix: revert apilicent
* fix: revert auth
* feat: improve currentRole logic
* feat: use resourcer.use instead it
* refactor: remove api-keys-auth
* fix: type
* refactor: move jwt to authManager
* refactor: remove unused code
* refactor: remove protected
* Revert "refactor: remove unused code"
This reverts commit 8f81535ab7e9c412bdc4d4bc05abad64ff60ba3f.
* feat: remove unused code
* feat: improve code
* fix: test error
* test: update test
* test: add test cases
* docs: update
* chore: update X-Role
* fix: token's roleName not work
* docs: update usage
* fix: i18n Add APi key
* docs: update capital
* docs: update
* feat: clean
* Update package.json
* Update roles.ts
* fix: api key
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-06-30 11:20:35 +08:00
Dunqing
4bf722326c
feat(map-plugin): support google map ( #2027 )
...
* feat(map-plugin): support google map
* fix: should render current position
* feat: support google map in field
* feat: support google map block
* feat: support connect data
* fix: update
* feat: support autocomplete instated of search
* feat: support language
* fix: drawing not work
* feat: support same labe lstyle
* feat: use better configuration
* fix: avoid rerender
* chore: update deps
* feat: add tips for lineString, Close T-591
* fix: zoom to big
* feat: improve api key incorrect flow
* fix: remove unreleated file
* feat: improve setFitView
* feat: update tips
* feat: improve code
* fix: avoid crash, Close T-713
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-06-30 11:08:53 +08:00
chenos
560c00cc3e
chore(versions): 😊 publish v0.10.0-alpha.5
2023-06-29 15:34:40 +08:00
chenos
c229d837a3
fix: dropdownMatchSelectWidth=false ( #2143 )
2023-06-28 10:13:35 +08:00
被雨水过滤的空气-Rairn
73dfe074d7
refactor: should use useDocumentTitle to change document title ( #2137 )
2023-06-27 18:42:33 +08:00
yaroslav.kr
dd3e872b06
Add *.pdf preview ( #2105 )
...
* Create uk-UA.json
added Ukrainian locale json
* Add files via upload
* fix
* Update uk_UA.ts
* feat(client): add pdf preview
* feat(client): add pdf preview to upload
* fix: refactor pdf preview
---------
Co-authored-by: alexkash <kashmensky@gmail.com>
2023-06-27 16:00:41 +08:00
chenos
e79ea701a3
fix: migration up error ( #2135 )
2023-06-27 15:19:32 +08:00
chenos
f3f91bd649
chore(versions): 😊 publish v0.10.0-alpha.4
2023-06-27 13:50:59 +08:00
chenos
4d3d00a5d2
fix: modify the migration file name
2023-06-27 13:10:34 +08:00
Junyi
6d80593f27
fix(plugin-workflow): change to use formv2 to avoid values updating issue ( #2124 )
2023-06-26 14:10:08 +08:00
Rairn
b2e71850f8
Revert "chore: upgrade types of react"
...
This reverts commit 78729bdc41
2023-06-25 15:02:12 +08:00
Rairn
78729bdc41
chore: upgrade types of react
2023-06-25 14:47:59 +08:00
chenos
83bf8ea3bb
chore(versions): 😊 publish v0.10.0-alpha.3
2023-06-25 14:04:19 +08:00
katherinehhh
7c5df477f3
fix: deleting the last field from sub table, the entire table will be delete ( #2077 )
...
* fix: deleting the last field from sub table, the entire table will be deleted
* refactor: association select support data scope in sub-table
* refactor: locale improve
* style: sub-table style improve
2023-06-25 14:01:52 +08:00
chenos
8b03dfa96b
fix(input-number): change step to 1 ( #2104 )
2023-06-24 17:15:59 +08:00
chenos
7bd3168422
fix: schema-uid-invalid ( #2107 )
2023-06-24 16:36:26 +08:00
chenos
40c1a2b2ce
fix(client): migration error
2023-06-24 12:28:43 +08:00
Junyi
19341952b9
fix(plugin-workflow): fix branch and exit logic ( #2103 )
2023-06-23 08:21:19 -07:00
chenos
bdcbe7392f
chore(deps): bump formily from 2.2.24 to 2.2.26 ( #2088 )
...
* chore(deps): bump formily from 2.2.24 to 2.2.25
* chore(deps): bump formily from 2.2.25 to 2.2.26
* chore: update yarn.lock
---------
Co-authored-by: Rairn <958414905@qq.com>
2023-06-23 07:55:44 +08:00
被雨水过滤的空气-Rairn
6eed9ac2bb
refactor: fix warning of antd 4.x ( #1998 )
...
* refactor: fix warning by codemod
* refactor: fix warning of Dropdown
* perf: use memo
* refactor: resolve SchemaInitializer
* refactor: fix lint
* refactor: remove SettingsForm
* refactor: resolve SchemaInitializer
* refactor: fix lint
* refactor: move useMenuItem to root dir
* chore: fix conflicts
* refactor: resolve SchemaSetting
* refactor: fix lint
* test: fix failed
* chore: upgrade Vite
* fix: fix style
* refactor: fix lint
* refactor: extract component
* refactor: resovle Menu
* refactor: resolve Tabs
* refactor(getPopupContainer): should return the unique div
* refactor(Drawer): change style to rootStyle and className to rootClassName
* chore: update yarn.lock
* fix: fix T-432
* fix: fix T-338
* fix: fix T-490
* fix: collection fields
* fix: fix style
* fix: fix T-500
* fix: fix SettingMenu error (close T-516)
* fix: fix tanslation of Map (T-506)
* style: fix style (T-508)
* fix: fix schemaSetting switch of mobile (T-517)
* fix: fix T-518
* fix: fix T-524
* fix: fix T-507
* perf: optimize SchemaInitializer.Button
* perf: optimize SchemaSettings
* fix: fix serch of SchemaInitializer (T-547)
* chore: change delay
* fix: fix button style (T-548)
* fix: fix scroll bar
* fix: update yarn.lock
* fix: fix build error
* fix: should update sideMenu when change it
* fix: fix build error
* chore: mouseEnterDelay
* fix: fix group menu can not selected
2023-06-22 19:51:16 +08:00
Junyi
5fc5428d03
fix(plugin-workflow): fix job button style ( #2098 )
2023-06-21 08:03:54 -07:00
Dunqing
b80aaacb38
fix(mobile-client): fix multiple bugs and do some improvement ( #2072 )
2023-06-21 22:26:15 +08:00
Junyi
6254fceb04
fix(plugin-verification): fix duplication of installation ( #2097 )
2023-06-21 06:59:19 -07:00
chenos
daa48302df
fix(acl): change route.uiSchemaUid to useAdminSchemaUid
2023-06-21 16:37:56 +08:00
Junyi
6a589543f9
refactor(db): add batch logic to update for better performance ( #2070 )
...
* refactor(db): add batch logic to update for better performance
* test(plugin-workflow): fix test cases
* fix(db): treat belongsTo field in update values as foreignKey
* fix(db): also handle object with id for belongsTo field
* fix(db): avoid 0 as falsy
* fix(db): fix test case
2023-06-21 16:37:06 +08:00
chenos
64070b81b9
refactor: migrate adminSchemaUid & mobileSchemaUid to system settings ( #2084 )
...
* refactor: migrate adminSchemaUid & mobileSchemaUid to system settings
* fix: error
2023-06-21 11:02:49 +08:00
Junyi
56e6d0c3b1
fix(plugin-workflow): fix occasional error on enter workflow page ( #2086 )
2023-06-20 19:53:31 -07:00
chenos
0b06e2cd69
chore(versions): 😊 publish v0.10.0-alpha.2
2023-06-20 11:51:16 +08:00
jack zhang
d76e8fb87f
refactor: upgrade umi, react and react-router-dom ( #1921 )
...
* refactor: update umi version 3.x to version 4.x
* refactor: update react-router-dom version to 6.x
* refactor(react-router-dom): change Layout Component `props.children` to `<Outlet />`
* refactor(react-router-dom): change <Route /> props and <RouteSwitch /> correct
* refactor(react-router-dom): replace `<Redirect />` to `<Navigate replace />`
* refactor(react-router-dom): replace `useHistory` to `useNavigate`
* refactor(react-router-dom): replace `useRouteMatch` to `useParams`
* refactor(react-router-dom & dumi): fix <RouteSwitch /> & umi document bug
* refactor(react-router-dom): `useRoutes` Optimize `<RouteSwitch />` code
* refactor(react-router-dom): update `Route` types and docs
* refactor(react-router-dom): optimize RouteSwitch code
* refactor(react-router-dom): `useLocation` no generics type
* refactor(react-router-dom): add `less v3.9.0` to `resolutions` to solve the error of `gulp-less`
* refactor(react-router-dom): fix `<RouteSwitch />` `props.routes` as an array is not handled
* chore: upgrade `dumi` and refactor docs
* fix: completed code review, add `targets` to solve browser compatibility & removed `chainWebpack`
* refactor(dumi): upgraded dumi under `packages/core/client`
* refactor(dumi): delete `packages/core/dumi-theme-nocobase`
* refactor(dumi): degrade `react` & replace `dumi-theme-antd` to `dumi-theme-nocobase`
* refactor(dumi): solve conflicts between multiple dumi applications
* fix: login page error in react 17
* refactor(dumi): remove less resolutions
* refactor(dumi): umi add `msfu: true` config
* fix: merge bug
* fix: self code review
* fix: code reivew and test bug
* refactor: upgrade react to 18
* refactor: degrade react types to 17
* chore: fix ci error
* fix: support routerBase & fix workflow page params
* fix(doc): menu externel link
* fix: build error
* fix: delete
* fix: vitest error
* fix: react-router new code replace
* fix: vitest markdown error
* fix: title is none when refresh
* fix: merge error
* fix: sidebar width is wrong
* fix: useProps error
* fix: side-menu-width
* fix: menu selectId is wrong & useProps is string
* fix: menu selected first default & side menu hide when change
* fix: test error & v0.10 change log
* fix: new compnent doc modify
* fix: set umi `fastRefresh=false`
* refactor: application v2
* fix: improve code
* fix: bug
* fix: page = 0 error
* fix: workflow navigate error
* feat: plugin manager
* fix: afterAdd
* feat: update docs
* feat: update docs
* fix: page tab change not work
* fix: login redirect query param doesn't work
* fix: bug and doc
* feat: update docs
* fix: ci error
* fix: merge main
* feat: update docs
* feat: update docs
* feat: update docs
* chore(versions): 😊 publish v0.10.0-alpha.1
* fix: translations
* chore: backend node test max old space size
* docs: add useSearchParams
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: ChengLei Shao <chareice@live.com>
2023-06-20 11:48:02 +08:00
ChengLei Shao
d8ad98e2f7
fix(collection-manager): share collection when COLLECTION_MANAGER_SCHEMA not set ( #2081 )
...
* fix: share collection when COLLECTION_MANAGER_SCHEMA not set
* fix: test
2023-06-20 11:28:54 +08:00
xilesun
c9f51ca416
fix(oidc): field map bug
2023-06-19 21:53:33 +08:00
Junyi
0606637a73
fix(plugin-formula): fix formula field effect and read-pretty component ( #2076 )
2023-06-19 06:47:29 -07:00
Zhou
44549fdfee
Update README.zh-CN.md
2023-06-19 21:32:16 +08:00
xilesun
f99bedfab4
docs(oidc): add README
2023-06-19 21:13:03 +08:00
Dunqing
6d0f5c1fe0
fix(mobile-client): the JsBridge is not work
2023-06-18 10:30:27 +08:00
Dunqing
21efc5c66c
fix(mobile-client): fix navigate is incorrect
2023-06-17 22:55:55 +08:00
chenos
106f9d90f5
fix(file-manager): only allow logged-in users to upload files
2023-06-17 21:53:49 +08:00
Junyi
e5bab3249a
refactor(plugin-workflow): manual collection block migration ( #2064 )
...
* refactor(plugin-workflow): change all collection node initializer in manual config
* refactor(plugin-workflow): clean code
* fix(plugin-workflow): fix custom form field in manual config
* refactor(plugin-workflow): add migration
* fix(plugin-workflow): fix custom form block migration
* fix(plugin-workflow): fix detail read-pretty for association fields
2023-06-15 23:06:47 -07:00
katherinehhh
4faf64f905
refactor(association-field): support sub table ( #1862 )
...
* fix: association select support data scope and sort setting
* fix: appends on demand loading
* fix: asociationSelect support multiple
* fix: recordPicker -> AssociationField
* fix: add migration
* fix: audit logs not show assication data
* fix: flattenNestedList
* refactor: file manager field mode
* refactor: field mode refactor
* fix: subtable action
* fix: subtable appends
* refactor: code improve
* fix: nester add new
* feat: sub table
* fix: data scope not effect immediately
* fix: association add new
* fix: association field failed to add new and mutual influence
* style: style improve
* style: style improve
* refactor: updateAssociationValues
* refactor: form init values
* refactor: select options
* fix: form initialValues
* fix: record picker values
* fix: field value change when field mode change
* fix: select data scope
* feat: add migration
* fix: table column enable link
* fix: table column enable link
* refactor: locale improve
* fix: migration
* fix: mutiple config
* fix: readPretty enable link
* fix: appends on demand
* fix: enable link style
* refactor: locale improve
* refactor: locale improve
* feat: sub-form migration
* fix: skip migration
* fix: translation
* fix: skip migration
* fix: getLabelFormatValue
* fix: error TS2339: Property 'find' does not exist on type 'string | SchemaEnum<any>'
* refactor: remove the logic code for converting old record picker
* refactor: locale
* refactor: association field support sub-table
* refactor: locale
* fix: sub-table should not support add new
* refactor: code improve
* refactor: locale
* fix: compatibility history Subtable
* fix: getNesterAppends filter bug
* refactor: useFieldModeOptions
* refactor: subTable
* fix: associationSelect
* fix: associationSelect
* fix: associationSelect
* fix: getAssociationAppends
* fix: sub-form collection context
* refactor: code improve
* refactor: code improve
* refactor: code improve
* refactor: code improve
* refactor: code improve
* fix: sub-table
* fix: appends
* fix: sub-table-appends
* fix: undefine id
* fix: sub-table appends
* refactor: sub-table
* refactor: sub-table supoort delete
* fix: sub-table-appends
* refactor: sub table initvvalue
* fix: sub-table-appends
* fix: association field appends
* fix: association field appends
* fix: association field appends
* style: style improve
* style: style improve
* refactor: textArear Markdown RichText
* style: style improve
* fix: title field
* refactor: code improve
* fix: system fields are not allowed to be edited
* refactor: subtable does not support inline operations
* refactor: jons edit in table
* refactor: sequence readOnly in table
* refactor: json readOnly in table
* fix: sub-table appends
* fix: runWhenParamsChanged
* fix: runWhenParamsChanged
* fix: sub-table appends
* fix: sub-table appends
* refactor: sub-table
* style: checkbox group intable
* style: delete button style improve
* fix: json edit in table
* fix: sub-table appends
* style: upload file in table column
* refactor: map edit in table
* refactor: map edit in table
* refactor: map field display in sub-table
* fix: support mutiple row
* refactor: sub-table
* refactor: sub-table not support sortable
* fix: sub-table appends
* fix: sub-table appends
* chore: useAssociationNames
* refactor: code improve
* refactor: support blocktemplate
* refactor: support blocktemplate
* fix: subtable
* fix: subtable initValue
* refactor: useAssociationNames in block template
* fix: cross hierarchical association field layout
* fix: normal field of association field should be append
* style: upload field in table
* refactor: sub table should not row selection
* style: checkboxGroup and radioGroup display in sub-table
* refactor: locale
* refactor: code improve
* refactor: quickEdit in sub-table
* refactor: quickEdit
* refactor: quickEdit
* refactor: quickEdit
* refactor: quickEdit
* style: quickEdit style improve
* style: quickEdit style improve
* style: quickEdit style improve
* refactor: sub-table support required config
* refactor: cell validate
* refactor: cell validate
* refactor: cell required validate
* refactor: cell required validate
* refactor: sub-table display when readPretty
* refactor: sub-table required
* refactor: sub-table required
* refactor: sub-table required
* refactor: sub-table initialValue
* refactor: table
* refactor: sub-tble field required
* refactor: sub-table style improve
* refactor: sub-table attachemnt
* refactor: code improve
* test: tableV2 snap
* fix: subtable drag
* test: tableV2 snap
* refactor: checkbox group and radio group in sub-table
* refactor: sub-table required style
* style: markdown style in sub-table
* refactor: markdown display in sub-table
* refactor: json field display in sub-table
* refactor: code improve
* style: style improve
* style: style improve
* refactor: inserView when designable
* refactor: china-region load data when dropdown click
* refactor: code improve
* refactor: code improve
* refactor: display loading when the form is first loaded
* refactor: display loading when the form is first loaded
* fix: verification exception when deleting sub table rows
* refactor: sub-table code improve
* refactor: sub-table code improve
* fix: json error feedback
* refactor: code improve
* fix: json onchange
* fix: sub table data did not change when switching data templates
* test: variable test
* test: variable test
* refactor: data template
* refactor: code improve
* refactor: code improve
* fix: upload readpretty
* fix: attach upload in sub-tabl
* fix: remove small
* fix: attach upload in sub-table
* refactor: association fields should not display in sub-table
* fix: dropdownMatchSelectWidth
* refactor: association fields should not display in sub-table
* refactor: selectFile is false in sub-table
* refactor: attacattachment in sub-table
* refactor: attacattachment in sub-table
* fix: selector style
* refactor: quick edit component
* fix: zindex
* style: style improve
* style: style improve
* feat: styling
* fix: style
* fix: style
* refactor: quickEdit getContainer
* refactor: quickEdit
* refactor: quickEdit
* fix: improve code
* refactor: code improve
* refactor: code improve
---------
Co-authored-by: chenos <chenlinxh@gmail.com>
2023-06-16 12:07:43 +08:00
Dunqing
3332a488ca
fix: display on the PC side of moblie access is incomplete ( #2039 )
...
* fix: display on the PC side of moblie access is incomplete
* fix: need refresh should work
* fix: again
* fix: keep 0.1
2023-06-14 10:41:07 +08:00
被雨水过滤的空气-Rairn
58840e5fab
refactor(PluginManager): remove useless code ( #2022 )
...
* refactor(PluginManager): remove useless code
* chore: fix build error
2023-06-14 09:35:09 +08:00
