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 Jul 19, 2024
2 parents 9575f14 + 125f83d commit 3a66e86
Show file tree
Hide file tree
Showing 105 changed files with 474 additions and 470 deletions.
5 changes: 4 additions & 1 deletion creator/packages/steedos-creator/client/router.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,10 @@ objectRoutes.route '/view/:record_id',
, 10
triggersExit: [
(context, redirect) ->
if Session.get("instance_change") && ((context.params?.object_name == 'instances' && context.queryParams?.side_listview_id == 'draft') || (context.params?.object_name == 'instance_tasks' && context.queryParams?.side_listview_id == 'inbox'))
side_listview_id = context.queryParams?.side_listview_id
if window._.isArray(side_listview_id)
side_listview_id = side_listview_id[0]
if Session.get("instance_change") && ((context.params?.object_name == 'instances' && side_listview_id == 'draft') || (context.params?.object_name == 'instance_tasks' && side_listview_id == 'inbox'))
ins = WorkflowManager.getInstance()
if !("draft" != ins.state && "draft" == Session.get("box"))
InstanceManager.saveIns(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,10 @@ InstanceReadOnlyTemplate.getValue = (value, field, locale, utcOffset) ->
value = _.map records, (item)->
fileName = item.original.name;
fileUrl = Steedos.absoluteUrl('/api/files/files/'+item._id);
match = fileName.match(/\.([^\.]+)$/);
fileType = match[0] || "";
filePreviewHtml = '';
if [".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.toLowerCase().slice(-4)) > -1
if [".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileType) > -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>"

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.7.4-beta.3",
"version": "2.7.4-beta.4",
"main": "package.service.js",
"scripts": {
"build": "tsc"
Expand All @@ -11,14 +11,14 @@
"access": "public"
},
"dependencies": {
"@steedos/accounts": "2.7.4-beta.3",
"@steedos/objectql": "2.7.4-beta.3",
"@steedos/service-package-loader": "2.7.4-beta.3",
"@steedos/accounts": "2.7.4-beta.4",
"@steedos/objectql": "2.7.4-beta.4",
"@steedos/service-package-loader": "2.7.4-beta.4",
"@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": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3"
"version": "2.7.4-beta.4"
}
14 changes: 7 additions & 7 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.7.4-beta.3",
"version": "2.7.4-beta.4",
"main": "lib/index.js",
"files": [
"/package.json",
Expand Down Expand Up @@ -29,7 +29,7 @@
"@accounts/two-factor": "^0.20.1",
"@accounts/types": "0.20.1",
"@babel/runtime": "^7.12.18",
"@steedos/utils": "2.7.4-beta.3",
"@steedos/utils": "2.7.4-beta.4",
"app-root-path": "^2.2.1",
"bcryptjs": "^2.4.3",
"body-parser": "1.19.0",
Expand All @@ -56,20 +56,20 @@
"validator": "^13.6.0"
},
"devDependencies": {
"@steedos/auth": "2.7.4-beta.3",
"@steedos/meteor-bundle-runner": "2.7.4-beta.3",
"@steedos/objectql": "2.7.4-beta.3",
"@steedos/auth": "2.7.4-beta.4",
"@steedos/meteor-bundle-runner": "2.7.4-beta.4",
"@steedos/objectql": "2.7.4-beta.4",
"@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.7.4-beta.3",
"steedos-server": "2.7.4-beta.4",
"typescript": "4.6.3"
},
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"main": "lib/index.js",
"scripts": {
"watch": "tsc --watch",
Expand All @@ -13,8 +13,8 @@
"access": "public"
},
"dependencies": {
"@steedos/cachers": "2.7.4-beta.3",
"@steedos/objectql": "2.7.4-beta.3",
"@steedos/cachers": "2.7.4-beta.4",
"@steedos/objectql": "2.7.4-beta.4",
"bcryptjs": "^2.4.3",
"cookies": "^0.8.0",
"express": "^4.16.4",
Expand All @@ -26,5 +26,5 @@
"devDependencies": {
"typescript": "4.6.3"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -19,5 +19,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"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.7.4-beta.3",
"@steedos/metadata-registrar": "2.7.4-beta.3",
"@steedos/metadata-core": "2.7.4-beta.4",
"@steedos/metadata-registrar": "2.7.4-beta.4",
"archiver": "^5.0.2",
"chalk": "2.4.2",
"change-case": "^3.1.0",
Expand Down Expand Up @@ -81,5 +81,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"description": "client lib for steedos",
"main": "lib/index.js",
"scripts": {
Expand All @@ -17,8 +17,8 @@
},
"license": "MIT",
"dependencies": {
"@steedos/filters": "2.7.4-beta.3",
"@steedos/filters": "2.7.4-beta.4",
"node-fetch": "^2.6.7"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -14,15 +14,15 @@
"author": "",
"license": "ISC",
"dependencies": {
"@steedos/auth": "2.7.4-beta.3",
"@steedos/filters": "2.7.4-beta.3",
"@steedos/i18n": "2.7.4-beta.3",
"@steedos/metadata-core": "2.7.4-beta.3",
"@steedos/migrate": "2.7.4-beta.3",
"@steedos/objectql": "2.7.4-beta.3",
"@steedos/odata-v4-mongodb": "2.7.4-beta.3",
"@steedos/process": "2.7.4-beta.3",
"@steedos/standard-objects": "2.7.4-beta.3",
"@steedos/auth": "2.7.4-beta.4",
"@steedos/filters": "2.7.4-beta.4",
"@steedos/i18n": "2.7.4-beta.4",
"@steedos/metadata-core": "2.7.4-beta.4",
"@steedos/migrate": "2.7.4-beta.4",
"@steedos/objectql": "2.7.4-beta.4",
"@steedos/odata-v4-mongodb": "2.7.4-beta.4",
"@steedos/process": "2.7.4-beta.4",
"@steedos/standard-objects": "2.7.4-beta.4",
"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.7.4-beta.3",
"@steedos/meteor-bundle-runner": "2.7.4-beta.4",
"@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": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"keywords": [
"react",
"steedos"
Expand Down Expand Up @@ -51,5 +51,5 @@
"engines": {
"node": ">=14"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"keywords": [
"steedos"
],
Expand Down Expand Up @@ -39,5 +39,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
"build": "rm -rf ./lib && tsc"
},
"dependencies": {
"@steedos/core": "2.7.4-beta.3",
"@steedos/metadata-api": "2.7.4-beta.3",
"@steedos/metadata-core": "2.7.4-beta.3",
"@steedos/objectql": "2.7.4-beta.3",
"@steedos/core": "2.7.4-beta.4",
"@steedos/metadata-api": "2.7.4-beta.4",
"@steedos/metadata-core": "2.7.4-beta.4",
"@steedos/objectql": "2.7.4-beta.4",
"bson": "4.6.4",
"csvtojson": "~2.0.10",
"dotenv-flow": "^3.1.0",
Expand All @@ -24,5 +24,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"description": "filters lib for steedos",
"main": "lib/index.js",
"files": [
Expand Down Expand Up @@ -36,5 +36,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"description": "Salesforce Formula Parser",
"main": "lib/formulon.js",
"files": [
Expand Down Expand Up @@ -46,5 +46,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@steedos/cachers": "2.7.4-beta.3",
"@steedos/cachers": "2.7.4-beta.4",
"i18next": "^19.3.4",
"i18next-sprintf-postprocessor": "^0.2.2",
"underscore": "1.13.4"
Expand All @@ -22,5 +22,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
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.7.4-beta.3",
"version": "2.7.4-beta.4",
"description": "",
"main": "lib/index.js",
"files": [
Expand All @@ -22,10 +22,10 @@
"access": "public"
},
"dependencies": {
"@steedos/auth": "2.7.4-beta.3",
"@steedos/core": "2.7.4-beta.3",
"@steedos/metadata-core": "2.7.4-beta.3",
"@steedos/objectql": "2.7.4-beta.3",
"@steedos/auth": "2.7.4-beta.4",
"@steedos/core": "2.7.4-beta.4",
"@steedos/metadata-core": "2.7.4-beta.4",
"@steedos/objectql": "2.7.4-beta.4",
"chalk": "^4.1.0",
"clone": "2.1.2",
"compressing": "^1.5.1",
Expand All @@ -37,9 +37,9 @@
"underscore": "^1.11.0"
},
"devDependencies": {
"@steedos/service-meteor-package-loader": "2.7.4-beta.3",
"@steedos/service-meteor-package-loader": "2.7.4-beta.4",
"javascript-obfuscator": "^2.9.1",
"typescript": "4.6.3"
},
"gitHead": "b7de0dc518ff3a27e974b4522f7874d8da9b53ba"
"gitHead": "fa9502980e43129dc97f9222581f2652e8242f09"
}
Loading

0 comments on commit 3a66e86

Please sign in to comment.