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 Jan 11, 2024
2 parents a0a6c0d + 8df012c commit e85e1e3
Show file tree
Hide file tree
Showing 119 changed files with 549 additions and 471 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,12 @@ InstanceReadOnlyTemplate.getValue = (value, field, locale, utcOffset) ->
records = Steedos.objectFind("cfs_files_filerecord", { filters: [["_id", 'in', value]], fields: ["_id", "original"] });

value = _.map records, (item)->
return "<a href='#{Steedos.absoluteUrl('/api/files/files/'+item._id+'?download=true')}' target='_blank' style='display: block;'>#{item.original.name}</a>"
fileName = item.original.name;
fileUrl = Steedos.absoluteUrl('/api/files/files/'+item._id);
filePreviewHtml = '';
if [".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.slice(-4)) > -1
filePreviewHtml = "&ensp;<a href='#{fileUrl}' target='_blank' class='antd-Link'><span class='antd-TplField'><span>预览</span></span></a>"
return "<div><a href='#{fileUrl+'?download=true'}' target='_blank'>#{fileName}</a> #{filePreviewHtml ? filePreviewHtml : ''}</div>"

value = value.join("");
when 'lookup'
Expand All @@ -392,7 +397,7 @@ InstanceReadOnlyTemplate.getValue = (value, field, locale, utcOffset) ->
value = _.map records, (item)->
return "<a href='#{Steedos.absoluteUrl('/app/-/'+field.reference_to+'/view/'+item._id)}' target='_blank'>#{item[nameField]}</a>"

value = value.join("");
value = value.join(" , ");
when 'html'
value = if value then "<div class=\"steedos-html\">#{value}</div>" else ''

Expand Down
10 changes: 5 additions & 5 deletions ee/sso-oidc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos/ee_sso-oidc",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"main": "package.service.js",
"scripts": {
"build": "tsc"
Expand All @@ -11,14 +11,14 @@
"access": "public"
},
"dependencies": {
"@steedos/accounts": "2.6.4-beta.1",
"@steedos/objectql": "2.6.4-beta.1",
"@steedos/service-package-loader": "2.6.4-beta.1",
"@steedos/accounts": "2.6.4-beta.2",
"@steedos/objectql": "2.6.4-beta.2",
"@steedos/service-package-loader": "2.6.4-beta.2",
"@techpass/passport-openidconnect": "^0.3.2",
"express": "4.18.1",
"node-fetch": "^2.6.7",
"passport": "^0.6.0",
"request-ip": "^2.2.0"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
],
"useWorkspaces": true,
"npmClient": "yarn",
"version": "2.6.4-beta.1"
"version": "2.6.4-beta.2"
}
12 changes: 6 additions & 6 deletions packages/accounts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/accounts",
"private": false,
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"main": "lib/index.js",
"files": [
"/package.json",
Expand Down Expand Up @@ -55,20 +55,20 @@
"validator": "^13.6.0"
},
"devDependencies": {
"@steedos/auth": "2.6.4-beta.1",
"@steedos/meteor-bundle-runner": "2.6.4-beta.1",
"@steedos/objectql": "2.6.4-beta.1",
"@steedos/auth": "2.6.4-beta.2",
"@steedos/meteor-bundle-runner": "2.6.4-beta.2",
"@steedos/objectql": "2.6.4-beta.2",
"@types/dotenv-flow": "^3.0.0",
"@types/node": "12.6.8",
"cross-env": "^7.0.3",
"dotenv": "^8.2.0",
"dotenv-flow": "^3.1.0",
"nodemon": "^2.0.19",
"steedos-server": "2.6.4-beta.1",
"steedos-server": "2.6.4-beta.2",
"typescript": "4.6.3"
},
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
8 changes: 4 additions & 4 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/auth",
"private": false,
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"main": "lib/index.js",
"scripts": {
"watch": "tsc --watch",
Expand All @@ -13,8 +13,8 @@
"access": "public"
},
"dependencies": {
"@steedos/cachers": "2.6.4-beta.1",
"@steedos/objectql": "2.6.4-beta.1",
"@steedos/cachers": "2.6.4-beta.2",
"@steedos/objectql": "2.6.4-beta.2",
"cookies": "^0.8.0",
"express": "^4.16.4",
"ismobilejs": "^1.1.1",
Expand All @@ -25,5 +25,5 @@
"devDependencies": {
"typescript": "4.6.3"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
4 changes: 2 additions & 2 deletions packages/cachers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/cachers",
"private": false,
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -19,5 +19,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
2 changes: 1 addition & 1 deletion packages/cli/default.steedos.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");

if(_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].1/dist/assets.json";
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].2/dist/assets.json";
}

if(_.isEmpty(process.env.SERIALIZER)){
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "steedos-cli",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "Develop and run your enterprise apps in miniutes",
"main": "dist/index.js",
"scripts": {
Expand Down Expand Up @@ -38,8 +38,8 @@
"@oclif/command": "^1.8.16",
"@oclif/config": "^1.8.3",
"@oclif/plugin-help": "^5.1.12",
"@steedos/metadata-core": "2.6.4-beta.1",
"@steedos/metadata-registrar": "2.6.4-beta.1",
"@steedos/metadata-core": "2.6.4-beta.2",
"@steedos/metadata-registrar": "2.6.4-beta.2",
"archiver": "^5.0.2",
"chalk": "2.4.2",
"change-case": "^3.1.0",
Expand Down Expand Up @@ -82,5 +82,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
6 changes: 3 additions & 3 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": false,
"name": "@steedos/client",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "client lib for steedos",
"main": "lib/index.js",
"scripts": {
Expand All @@ -17,8 +17,8 @@
},
"license": "MIT",
"dependencies": {
"@steedos/filters": "2.6.4-beta.1",
"@steedos/filters": "2.6.4-beta.2",
"node-fetch": "^2.6.7"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
24 changes: 12 additions & 12 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/core",
"private": false,
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -14,15 +14,15 @@
"author": "",
"license": "ISC",
"dependencies": {
"@steedos/auth": "2.6.4-beta.1",
"@steedos/filters": "2.6.4-beta.1",
"@steedos/i18n": "2.6.4-beta.1",
"@steedos/metadata-core": "2.6.4-beta.1",
"@steedos/migrate": "2.6.4-beta.1",
"@steedos/objectql": "2.6.4-beta.1",
"@steedos/odata-v4-mongodb": "2.6.4-beta.1",
"@steedos/process": "2.6.4-beta.1",
"@steedos/standard-objects": "2.6.4-beta.1",
"@steedos/auth": "2.6.4-beta.2",
"@steedos/filters": "2.6.4-beta.2",
"@steedos/i18n": "2.6.4-beta.2",
"@steedos/metadata-core": "2.6.4-beta.2",
"@steedos/migrate": "2.6.4-beta.2",
"@steedos/objectql": "2.6.4-beta.2",
"@steedos/odata-v4-mongodb": "2.6.4-beta.2",
"@steedos/process": "2.6.4-beta.2",
"@steedos/standard-objects": "2.6.4-beta.2",
"body-parser": "^1.18.1",
"bunyan-sfdx-no-dtrace": "^1.8.2",
"clone": "^2.1.2",
Expand All @@ -45,7 +45,7 @@
"devDependencies": {
"@salesforce/kit": "1.0.4",
"@salesforce/ts-types": "1.1.2",
"@steedos/meteor-bundle-runner": "2.6.4-beta.1",
"@steedos/meteor-bundle-runner": "2.6.4-beta.2",
"@types/express": "^4.16.1",
"@types/node": "^11.10.4",
"@types/underscore": "^1.8.13",
Expand All @@ -57,5 +57,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
4 changes: 2 additions & 2 deletions packages/create-steedos-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-steedos-app",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"keywords": [
"react",
"steedos"
Expand Down Expand Up @@ -51,5 +51,5 @@
"engines": {
"node": ">=14"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
4 changes: 2 additions & 2 deletions packages/create-steedos-package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-steedos-package",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"keywords": [
"steedos"
],
Expand Down Expand Up @@ -39,5 +39,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
12 changes: 6 additions & 6 deletions packages/data-import/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@steedos/data-import",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
"build": "rm -rf ./lib && tsc"
},
"dependencies": {
"@steedos/core": "2.6.4-beta.1",
"@steedos/metadata-api": "2.6.4-beta.1",
"@steedos/metadata-core": "2.6.4-beta.1",
"@steedos/objectql": "2.6.4-beta.1",
"@steedos/core": "2.6.4-beta.2",
"@steedos/metadata-api": "2.6.4-beta.2",
"@steedos/metadata-core": "2.6.4-beta.2",
"@steedos/objectql": "2.6.4-beta.2",
"bson": "4.6.4",
"csvtojson": "~2.0.10",
"dotenv-flow": "^3.1.0",
Expand All @@ -24,5 +24,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
4 changes: 2 additions & 2 deletions packages/filters/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/filters",
"private": false,
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "filters lib for steedos",
"main": "lib/index.js",
"files": [
Expand Down Expand Up @@ -36,5 +36,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
4 changes: 2 additions & 2 deletions packages/formula/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos/formula",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "Salesforce Formula Parser",
"main": "lib/formulon.js",
"files": [
Expand Down Expand Up @@ -46,5 +46,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
6 changes: 3 additions & 3 deletions packages/i18n/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/i18n",
"private": false,
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@steedos/cachers": "2.6.4-beta.1",
"@steedos/cachers": "2.6.4-beta.2",
"i18next": "^19.3.4",
"i18next-sprintf-postprocessor": "^0.2.2",
"underscore": "1.13.4"
Expand All @@ -22,5 +22,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
14 changes: 7 additions & 7 deletions packages/metadata-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos/metadata-api",
"version": "2.6.4-beta.1",
"version": "2.6.4-beta.2",
"description": "",
"main": "lib/index.js",
"files": [
Expand All @@ -21,10 +21,10 @@
"access": "public"
},
"dependencies": {
"@steedos/auth": "2.6.4-beta.1",
"@steedos/core": "2.6.4-beta.1",
"@steedos/metadata-core": "2.6.4-beta.1",
"@steedos/objectql": "2.6.4-beta.1",
"@steedos/auth": "2.6.4-beta.2",
"@steedos/core": "2.6.4-beta.2",
"@steedos/metadata-core": "2.6.4-beta.2",
"@steedos/objectql": "2.6.4-beta.2",
"chalk": "^4.1.0",
"clone": "2.1.2",
"compressing": "^1.5.1",
Expand All @@ -36,9 +36,9 @@
"underscore": "^1.11.0"
},
"devDependencies": {
"@steedos/service-meteor-package-loader": "2.6.4-beta.1",
"@steedos/service-meteor-package-loader": "2.6.4-beta.2",
"javascript-obfuscator": "^2.9.1",
"typescript": "4.6.3"
},
"gitHead": "3c48181d4c11b106c75f3618d9557e628242cba9"
"gitHead": "5d9b13f761ed55f3568e220a4b031fbe906105ac"
}
Loading

0 comments on commit e85e1e3

Please sign in to comment.