test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-29 18:48:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: 调整 api 构建有 jsonql 的情况 (#8202)

Browse Source 
* bump: release 3.4.1

* chore: 调整 api 构建有 jsonql 的情况
This commit is contained in:
liaoxuezhi 2023-09-22 13:06:55 +08:00 committed by GitHub
parent 07af6c666d
commit 5124b71861
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -5,5 +5,5 @@
"packages/amis-ui",
"packages/amis"
],
"version": "3.4.1-alpha.0"
"version": "3.4.1"
}

2
packages/amis-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "amis-core",
"version": "3.4.1-alpha.0",
"version": "3.4.1",
"description": "amis-core",
"main": "lib/index.js",
"module": "esm/index.js",

5
packages/amis-core/src/utils/api.ts
View File

@ -94,7 +94,7 @@ export function buildApi(
) as any;
}
if (!data || api.data instanceof FormData) {
if (!data) {
return api;
} else if (
data instanceof FormData ||
@ -212,6 +212,7 @@ export function buildApi(
return api;
}
const hasCustomData = api.data;
if (api.data) {
api.body = api.data = dataMapping(
api.data,
@ -299,7 +300,7 @@ export function buildApi(
);
/** 同时设置了JSONQL和data时走兼容场景 */
api.body = api.data =
api.data && api.jsonql
hasCustomData && api.jsonql
? {
data: api.data,
jsonql: api.jsonql

2
packages/amis-formula/package.json
View File

@ -1,6 +1,6 @@
{
"name": "amis-formula",
"version": "3.4.1-alpha.0",
"version": "3.4.1",
"description": "负责 amis 里面的表达式实现，内置公式，编辑器等",
"main": "lib/index.js",
"module": "esm/index.js",

5
packages/amis-formula/src/doc.ts
View File

@ -1057,7 +1057,8 @@ export const doc: {
},
{
name: 'WEEKDAY',
description: "获取日期的星期几。\n\n示例\n\nWEEKDAY('2023-02-27') 得到 1。",
description:
"获取日期的星期几。\n\n示例\n\nWEEKDAY('2023-02-27') 得到 0。\nWEEKDAY('2023-02-27', 2) 得到 1。",
example: 'WEEKDAY(date)',
params: [
{
@ -1081,7 +1082,7 @@ export const doc: {
{
name: 'WEEK',
description:
"获取年份的星期，即第几周。\n\n示例\n\nWEEK('2023-03-05') 得到 10。",
"获取年份的星期，即第几周。\n\n示例\n\nWEEK('2023-03-05') 得到 9。",
example: 'WEEK(date)',
params: [
{

6
packages/amis-ui/package.json
View File

@ -3,7 +3,7 @@
"main": "lib/index.js",
"module": "esm/index.js",
"types": "lib/index.d.ts",
"version": "3.4.1-alpha.0",
"version": "3.4.1",
"description": "",
"scripts": {
"build": "npm run clean-dist && NODE_ENV=production rollup -c ",
@ -36,8 +36,8 @@
},
"dependencies": {
"@rc-component/mini-decimal": "^1.0.1",
"amis-core": "^3.4.1-alpha.0",
"amis-formula": "^3.4.1-alpha.0",
"amis-core": "^3.4.1",
"amis-formula": "^3.4.1",
"classnames": "2.3.2",
"codemirror": "^5.63.0",
"downshift": "6.1.12",

16
packages/amis/package.json
View File

@ -1,6 +1,6 @@
{
"name": "amis",
"version": "3.4.1-alpha.0",
"version": "3.4.1",
"description": "一种MIS页面生成工具",
"main": "lib/index.js",
"module": "esm/index.js",
@ -37,8 +37,8 @@
}
],
"dependencies": {
"amis-core": "^3.4.1-alpha.0",
"amis-ui": "^3.4.1-alpha.0",
"amis-core": "^3.4.1",
"amis-ui": "^3.4.1",
"attr-accept": "2.2.2",
"blueimp-canvastoblob": "2.1.0",
"classnames": "2.3.2",
@ -67,14 +67,14 @@
"rc-overflow": "^1.2.4",
"react-cropper": "^2.1.8",
"react-dropzone": "^11.4.2",
"react-error-boundary": "^4.0.11",
"react-intersection-observer": "9.5.2",
"react-json-view": "1.21.3",
"react-transition-group": "4.4.2",
"sortablejs": "1.15.0",
"tslib": "^2.3.1",
"video-react": "0.15.0",
"xlsx": "^0.18.5",
"react-intersection-observer": "9.5.2",
"react-error-boundary": "^4.0.11"
"xlsx": "^0.18.5"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "^6.1.1",
@ -83,10 +83,9 @@
"@rollup/plugin-node-resolve": "^14.1.0",
"@rollup/plugin-typescript": "^8.3.4",
"@svgr/rollup": "^6.2.1",
"@testing-library/dom": "8.20.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/dom": "8.20.1",
"regexp.prototype.flags": "1.5.0",
"@types/async": "^2.0.45",
"@types/codemirror": "^5.60.3",
"@types/echarts": "^4.9.2",
@ -139,6 +138,7 @@
"react-router": "5.2.1",
"react-router-dom": "5.3.0",
"react-test-renderer": "^18.0.0",
"regexp.prototype.flags": "1.5.0",
"rimraf": "^3.0.2",
"rollup": "^2.79.1",
"rollup-plugin-auto-external": "^2.0.0",