Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored May 15, 2024
2 parents 5c7ec0e + 81c5cd9 commit 1d152cd
Show file tree
Hide file tree
Showing 17 changed files with 43 additions and 22 deletions.
2 changes: 1 addition & 1 deletion apps/experience/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos/ee_experience",
"version": "3.6.14",
"version": "3.6.15",
"main": "package.service.js",
"private": true,
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion apps/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook",
"version": "3.6.14",
"version": "3.6.15",
"main": "index.js",
"private": true,
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"registry": "https://registry.npmjs.org/"
}
},
"version": "3.6.14"
"version": "3.6.15"
}
4 changes: 2 additions & 2 deletions packages/@steedos-widgets/ag-grid/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/ag-grid",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/ag-grid.cjs.js",
"module": "dist/ag-grid.esm.js",
"unpkg": "dist/ag-grid.umd.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
},
"dependencies": {
"@rollup/plugin-replace": "^5.0.2",
"@steedos-widgets/amis-lib": "3.6.14",
"@steedos-widgets/amis-lib": "3.6.15",
"ag-grid-community": "~31.0.2",
"ag-grid-enterprise": "~31.0.2",
"ag-grid-react": "~31.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/@steedos-widgets/amis-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/amis-lib",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"unpkg": "./dist/index.umd.js",
"main": "./dist/index.cjs.js",
"module": "./dist/index.esm.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import * as Fields from '../fields';
import * as Tpl from '../tpl';
import * as File from './file';
import { getAmisStaticFieldType } from './type';
import * as _ from 'lodash'
import * as _ from 'lodash';
import { i18next } from "../../../../i18n";

export const QUICK_SEARCHABLE_FIELD_TYPES = ["text", "textarea", "autonumber", "url", "email"];
export const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
Expand Down Expand Up @@ -581,6 +582,21 @@ export async function convertSFieldToAmisField(field, readonly, ctx) {
type: getAmisStaticFieldType('url', readonly, field),
static: readonly ? true : false
}
if(!readonly){
// amis input-url控件不支持相对路径,这里支持下
// 如果要使用amis原生input-url控件的默认的isUrl验证效果或自定义字段validations效果,配置字段的amis.validations属性即可,配置为null或空字符串则使用amis默认的isUrl效果
let fieldAmisValidations = field.amis?.validations;
if(typeof fieldAmisValidations === "undefined"){
Object.assign(convertData, {
"validations": {
"matchRegexp": "^((http:\\/\\/|https:\\/\\/|ftp:\\/\\/|sftp:\\/\\/)+([^\\s\\/\\.]+(\\.[^\\s\\/\\.]+)+))*(\\/[^\\s\\.\\/]+)*$"
},
"validationErrors": {
"matchRegexp": i18next.t('frontend_form_validation_failed_url')//"URL 格式不正确"
}
})
}
}
if(readonly && field.show_as_qr){
convertData = {
type: "control",
Expand Down
1 change: 1 addition & 0 deletions packages/@steedos-widgets/amis-lib/src/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"frontend_form_delete": "Delete",
"frontend_form_view": "view",
"frontend_form_details": "details",
"frontend_form_validation_failed_url": "The URL format is incorrect",
"frontend_delete_confirm_text": "Are you sure you want to delete this item?",
"frontend_delete_many_selected_required": "Please select the item to be deleted",
"frontend_delete_many_confirm_text": "Are you sure you want to delete?",
Expand Down
1 change: 1 addition & 0 deletions packages/@steedos-widgets/amis-lib/src/locales/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"frontend_form_delete": "删除",
"frontend_form_view": "查看",
"frontend_form_details": "详情",
"frontend_form_validation_failed_url": "URL 格式不正确",
"frontend_delete_confirm_text": "确定要删除此项目?",
"frontend_delete_many_selected_required": "请选择要删除的项",
"frontend_delete_many_confirm_text": "确定要删除吗?",
Expand Down
4 changes: 2 additions & 2 deletions packages/@steedos-widgets/amis-object/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/amis-object",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/amis-object.cjs.js",
"module": "dist/amis-object.esm.js",
"unpkg": "dist/amis-object.umd.js",
Expand Down Expand Up @@ -61,7 +61,7 @@
"uglify-js": "^3.17.0"
},
"dependencies": {
"@steedos-widgets/amis-lib": "3.6.14",
"@steedos-widgets/amis-lib": "3.6.15",
"autoprefixer": "^10.4.13",
"postcss": "^8.4.19",
"tailwindcss": "^3.2.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: [email protected]
* @Date: 2022-09-01 14:44:57
* @LastEditors: 殷亮辉 [email protected]
* @LastEditTime: 2024-05-14 13:30:24
* @LastEditTime: 2024-05-14 15:12:49
* @Description:
*/

Expand Down Expand Up @@ -49,6 +49,9 @@ export const AmisAppLauncher = async (props) => {
item.visible_on = false;
}
}
else{
item.visible_on = true;
}
});
`;

Expand Down
4 changes: 2 additions & 2 deletions packages/@steedos-widgets/ckeditor/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/ckeditor",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/ckeditor.cjs.js",
"module": "dist/ckeditor.esm.js",
"unpkg": "dist/ckeditor.umd.js",
Expand Down Expand Up @@ -55,7 +55,7 @@
"@ckeditor/ckeditor5-react": "~6.2.0",
"@ckeditor/ckeditor5-theme-lark": "^41.2.1",
"@rollup/plugin-replace": "^5.0.2",
"@steedos-widgets/amis-lib": "3.6.14",
"@steedos-widgets/amis-lib": "3.6.15",
"rollup-plugin-string": "^3.0.0"
},
"gitHead": "ffb730e16642eb8e7a7ae5d98d0773c42482e7d2"
Expand Down
4 changes: 2 additions & 2 deletions packages/@steedos-widgets/devextreme/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/devextreme",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/devextreme.cjs.js",
"module": "dist/devextreme.esm.js",
"unpkg": "dist/devextreme.umd.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
},
"dependencies": {
"@rollup/plugin-replace": "^5.0.2",
"@steedos-widgets/amis-lib": "3.6.14",
"@steedos-widgets/amis-lib": "3.6.15",
"devextreme": "^23.2.3",
"devextreme-react": "^23.2.3",
"rollup-plugin-copy": "^3.5.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/@steedos-widgets/example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/example",
"private": true,
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/meta.js",
"module": "dist/meta.js",
"unpkg": "dist/meta.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/@steedos-widgets/fullcalendar/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/fullcalendar",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/fullcalendar.cjs.js",
"module": "dist/fullcalendar.esm.js",
"unpkg": "dist/fullcalendar.umd.js",
Expand Down Expand Up @@ -54,7 +54,7 @@
"@fullcalendar/list": "5.11.4",
"@fullcalendar/react": "5.11.4",
"@fullcalendar/timegrid": "5.11.4",
"@steedos-widgets/amis-lib": "3.6.14"
"@steedos-widgets/amis-lib": "3.6.15"
},
"gitHead": "ffb730e16642eb8e7a7ae5d98d0773c42482e7d2"
}
4 changes: 2 additions & 2 deletions packages/@steedos-widgets/reactflow/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/reactflow",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/reactflow.cjs.js",
"module": "dist/reactflow.esm.js",
"unpkg": "dist/reactflow.umd.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
},
"dependencies": {
"@rollup/plugin-replace": "^5.0.2",
"@steedos-widgets/amis-lib": "3.6.14",
"@steedos-widgets/amis-lib": "3.6.15",
"reactflow": "^11.5.6"
},
"gitHead": "ffb730e16642eb8e7a7ae5d98d0773c42482e7d2"
Expand Down
4 changes: 2 additions & 2 deletions packages/@steedos-widgets/sortable/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos-widgets/sortable",
"version": "3.6.14",
"version": "3.6.15",
"main": "dist/sortable.cjs.js",
"module": "dist/sortable.esm.js",
"unpkg": "dist/sortable.umd.js",
Expand Down Expand Up @@ -45,7 +45,7 @@
"dependencies": {
"@dnd-kit/core": "^6.0.5",
"@dnd-kit/sortable": "^7.0.1",
"@steedos-widgets/amis-lib": "3.6.14"
"@steedos-widgets/amis-lib": "3.6.15"
},
"gitHead": "ffb730e16642eb8e7a7ae5d98d0773c42482e7d2"
}
2 changes: 1 addition & 1 deletion packages/@steedos-widgets/steedos-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos-widgets/steedos-lib",
"private": false,
"version": "3.6.14",
"version": "3.6.15",
"unpkg": "./dist/index.umd.js",
"main": "./dist/index.cjs.js",
"module": "./dist/index.esm.js",
Expand Down

0 comments on commit 1d152cd

Please sign in to comment.