Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] authored Jan 9, 2024
2 parents f257af7 + 2b56101 commit 1032f46
Show file tree
Hide file tree
Showing 113 changed files with 510 additions and 480 deletions.
8 changes: 7 additions & 1 deletion creator/packages/steedos-workflow/client/views/instance/instance_button.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,18 @@ instanceButtonHelpers =
unless record
return {}
record.box = Session.get("box")

if Session.get("box") is 'outbox'
distributeStepId = InstanceManager.getLastTraceStepId(record.traces)
else
distributeStepId = _.last(record.traces).step;
return {
app_id: Session.get("app_id")
object_name: Session.get("object_name")
permissions: Creator.getPermissions(),
record_id: record._id,
record: record
record: record,
distributeStepId: distributeStepId
}

enabled_save: ->
Expand Down
10 changes: 5 additions & 5 deletions ee/sso-oidc/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos/ee_sso-oidc",
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"main": "package.service.js",
"scripts": {
"build": "tsc"
Expand All @@ -11,14 +11,14 @@
"access": "public"
},
"dependencies": {
"@steedos/accounts": "2.6.2-beta.35",
"@steedos/objectql": "2.6.2-beta.35",
"@steedos/service-package-loader": "2.6.2-beta.35",
"@steedos/accounts": "2.6.2-beta.36",
"@steedos/objectql": "2.6.2-beta.36",
"@steedos/service-package-loader": "2.6.2-beta.36",
"@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": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
],
"useWorkspaces": true,
"npmClient": "yarn",
"version": "2.6.2-beta.35"
"version": "2.6.2-beta.36"
}
12 changes: 6 additions & 6 deletions packages/accounts/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/accounts",
"private": false,
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"main": "lib/index.js",
"files": [
"/package.json",
Expand Down Expand Up @@ -55,20 +55,20 @@
"validator": "^13.6.0"
},
"devDependencies": {
"@steedos/auth": "2.6.2-beta.35",
"@steedos/meteor-bundle-runner": "2.6.2-beta.35",
"@steedos/objectql": "2.6.2-beta.35",
"@steedos/auth": "2.6.2-beta.36",
"@steedos/meteor-bundle-runner": "2.6.2-beta.36",
"@steedos/objectql": "2.6.2-beta.36",
"@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.2-beta.35",
"steedos-server": "2.6.2-beta.36",
"typescript": "4.6.3"
},
"publishConfig": {
"access": "public"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
8 changes: 4 additions & 4 deletions packages/auth/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/auth",
"private": false,
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"main": "lib/index.js",
"scripts": {
"watch": "tsc --watch",
Expand All @@ -13,8 +13,8 @@
"access": "public"
},
"dependencies": {
"@steedos/cachers": "2.6.2-beta.35",
"@steedos/objectql": "2.6.2-beta.35",
"@steedos/cachers": "2.6.2-beta.36",
"@steedos/objectql": "2.6.2-beta.36",
"cookies": "^0.8.0",
"express": "^4.16.4",
"ismobilejs": "^1.1.1",
Expand All @@ -25,5 +25,5 @@
"devDependencies": {
"typescript": "4.6.3"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
4 changes: 2 additions & 2 deletions packages/cachers/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/cachers",
"private": false,
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -19,5 +19,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
4 changes: 2 additions & 2 deletions packages/cli/default.steedos.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ process.env.STEEDOS_UNPKG_URL = process.env.STEEDOS_UNPKG_URL.replace(/\/+$/, "


if(_.isEmpty(process.env.STEEDOS_AMIS_VERSION)) {
process.env.STEEDOS_AMIS_VERSION = '3.6.3-patch.2';
process.env.STEEDOS_AMIS_VERSION = '3.6.3-patch.4';
}

if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
Expand All @@ -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].0-beta.10/dist/assets.json";
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].1/dist/assets.json";
}

if(_.isEmpty(process.env.SERIALIZER)){
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "steedos-cli",
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"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.2-beta.35",
"@steedos/metadata-registrar": "2.6.2-beta.35",
"@steedos/metadata-core": "2.6.2-beta.36",
"@steedos/metadata-registrar": "2.6.2-beta.36",
"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": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
6 changes: 3 additions & 3 deletions packages/client/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": false,
"name": "@steedos/client",
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"description": "client lib for steedos",
"main": "lib/index.js",
"scripts": {
Expand All @@ -17,8 +17,8 @@
},
"license": "MIT",
"dependencies": {
"@steedos/filters": "2.6.2-beta.35",
"@steedos/filters": "2.6.2-beta.36",
"node-fetch": "^2.6.7"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
24 changes: 12 additions & 12 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/core",
"private": false,
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -14,15 +14,15 @@
"author": "",
"license": "ISC",
"dependencies": {
"@steedos/auth": "2.6.2-beta.35",
"@steedos/filters": "2.6.2-beta.35",
"@steedos/i18n": "2.6.2-beta.35",
"@steedos/metadata-core": "2.6.2-beta.35",
"@steedos/migrate": "2.6.2-beta.35",
"@steedos/objectql": "2.6.2-beta.35",
"@steedos/odata-v4-mongodb": "2.6.2-beta.35",
"@steedos/process": "2.6.2-beta.35",
"@steedos/standard-objects": "2.6.2-beta.35",
"@steedos/auth": "2.6.2-beta.36",
"@steedos/filters": "2.6.2-beta.36",
"@steedos/i18n": "2.6.2-beta.36",
"@steedos/metadata-core": "2.6.2-beta.36",
"@steedos/migrate": "2.6.2-beta.36",
"@steedos/objectql": "2.6.2-beta.36",
"@steedos/odata-v4-mongodb": "2.6.2-beta.36",
"@steedos/process": "2.6.2-beta.36",
"@steedos/standard-objects": "2.6.2-beta.36",
"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.2-beta.35",
"@steedos/meteor-bundle-runner": "2.6.2-beta.36",
"@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": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
4 changes: 2 additions & 2 deletions packages/create-steedos-app/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-steedos-app",
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"keywords": [
"react",
"steedos"
Expand Down Expand Up @@ -51,5 +51,5 @@
"engines": {
"node": ">=14"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
4 changes: 2 additions & 2 deletions packages/create-steedos-package/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-steedos-package",
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"keywords": [
"steedos"
],
Expand Down Expand Up @@ -39,5 +39,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
12 changes: 6 additions & 6 deletions packages/data-import/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@steedos/data-import",
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
"build": "rm -rf ./lib && tsc"
},
"dependencies": {
"@steedos/core": "2.6.2-beta.35",
"@steedos/metadata-api": "2.6.2-beta.35",
"@steedos/metadata-core": "2.6.2-beta.35",
"@steedos/objectql": "2.6.2-beta.35",
"@steedos/core": "2.6.2-beta.36",
"@steedos/metadata-api": "2.6.2-beta.36",
"@steedos/metadata-core": "2.6.2-beta.36",
"@steedos/objectql": "2.6.2-beta.36",
"bson": "4.6.4",
"csvtojson": "~2.0.10",
"dotenv-flow": "^3.1.0",
Expand All @@ -24,5 +24,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
8 changes: 6 additions & 2 deletions packages/data-import/src/objectImport.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ const FILE_EXT_TYPES = ['.xlsx', '.xls'];

const FIX_SECONDS = 43; // 解决 nodejs date.getTimezoneOffset不准问题 https://github.com/SheetJS/sheetjs/issues/2350

function _getDate(date: Date, utcOffset: Number) {
return new Date(moment(date).add(utcOffset, 'h').add(FIX_SECONDS, 's').format('YYYY-MM-DD'));
}

function converterString(field_name, dataCell, jsonObj) {
if (dataCell) {
jsonObj[field_name] = dataCell.toString();
Expand All @@ -42,7 +46,7 @@ function converterDate(field_name, dataCell, jsonObj, utcOffset) {

if (_.isDate(dataCell)) {
try {
jsonObj[field_name] = new Date(moment(dataCell).add(utcOffset, 'h').add(FIX_SECONDS, 's').format('YYYY-MM-DD'));
jsonObj[field_name] = _getDate(dataCell, utcOffset)
} catch (error) {
return error.message
}
Expand All @@ -54,7 +58,7 @@ function converterDate(field_name, dataCell, jsonObj, utcOffset) {
date.getFullYear() &&
Object.prototype.toString.call(date) === "[object Date]"
) {
jsonObj[field_name] = date;
jsonObj[field_name] = _getDate(date, utcOffset)
} else {
date_error = `${dataCell}不是日期类型数据`;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/filters/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/filters",
"private": false,
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"description": "filters lib for steedos",
"main": "lib/index.js",
"files": [
Expand Down Expand Up @@ -36,5 +36,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
4 changes: 2 additions & 2 deletions packages/formula/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@steedos/formula",
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"description": "Salesforce Formula Parser",
"main": "lib/formulon.js",
"files": [
Expand Down Expand Up @@ -46,5 +46,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
6 changes: 3 additions & 3 deletions packages/i18n/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@steedos/i18n",
"private": false,
"version": "2.6.2-beta.35",
"version": "2.6.2-beta.36",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand All @@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@steedos/cachers": "2.6.2-beta.35",
"@steedos/cachers": "2.6.2-beta.36",
"i18next": "^19.3.4",
"i18next-sprintf-postprocessor": "^0.2.2",
"underscore": "1.13.4"
Expand All @@ -22,5 +22,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "0ee80cda18567eca0efc64396f04b679ead06ef6"
"gitHead": "9ef7e95f69e5658d8944c88f307b8a75e339e3eb"
}
Loading

0 comments on commit 1032f46

Please sign in to comment.