diff --git a/ee/sso-oidc/package.json b/ee/sso-oidc/package.json index 71726ef733..72fe7be1ae 100644 --- a/ee/sso-oidc/package.json +++ b/ee/sso-oidc/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/ee_sso-oidc", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": { "build": "tsc" @@ -11,14 +11,14 @@ "access": "public" }, "dependencies": { - "@steedos/accounts": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/service-package-loader": "2.7.1-beta.16", + "@steedos/accounts": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/service-package-loader": "2.7.1-beta.17", "@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": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/lerna.json b/lerna.json index 628d4d07d3..068b28a373 100644 --- a/lerna.json +++ b/lerna.json @@ -8,5 +8,5 @@ ], "useWorkspaces": true, "npmClient": "yarn", - "version": "2.7.1-beta.16" + "version": "2.7.1-beta.17" } diff --git a/packages/accounts/package.json b/packages/accounts/package.json index 275c13fd6e..b0e7a0ea63 100644 --- a/packages/accounts/package.json +++ b/packages/accounts/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/accounts", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "lib/index.js", "files": [ "/package.json", @@ -29,7 +29,7 @@ "@accounts/two-factor": "^0.20.1", "@accounts/types": "0.20.1", "@babel/runtime": "^7.12.18", - "@steedos/utils": "2.7.1-beta.16", + "@steedos/utils": "2.7.1-beta.17", "app-root-path": "^2.2.1", "bcryptjs": "^2.4.3", "body-parser": "1.19.0", @@ -56,20 +56,20 @@ "validator": "^13.6.0" }, "devDependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/meteor-bundle-runner": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/meteor-bundle-runner": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "@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.1-beta.16", + "steedos-server": "2.7.1-beta.17", "typescript": "4.6.3" }, "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/accounts/src/database-mongo/mongo.ts b/packages/accounts/src/database-mongo/mongo.ts index 030c904570..a9fa293f0e 100644 --- a/packages/accounts/src/database-mongo/mongo.ts +++ b/packages/accounts/src/database-mongo/mongo.ts @@ -180,6 +180,9 @@ export class Mongo implements DatabaseInterface { } public async findUserByEmail(email: string): Promise { + if(!isString(email)){ + return null + } const user:any = await this.collection.findOne({ email: email.toLowerCase(), }); @@ -190,6 +193,9 @@ export class Mongo implements DatabaseInterface { } public async findUserByMobile(mobile: string): Promise { + if(!isString(mobile)){ + return null + } const selector = { mobile, } @@ -205,6 +211,9 @@ export class Mongo implements DatabaseInterface { } public async findUserByUsername(username: string): Promise { + if(!isString(username)){ + return null + } const filter = this.options.caseSensitiveUserName ? { username } : { @@ -228,6 +237,9 @@ export class Mongo implements DatabaseInterface { public async findUserByEmailVerificationToken( token: string ): Promise { + if(!isString(token)){ + return null + } const user:any = await this.collection.findOne({ "services.email.verificationTokens.token": token, }); @@ -240,6 +252,9 @@ export class Mongo implements DatabaseInterface { public async findUserByResetPasswordToken( token: string ): Promise { + if(!isString(token)){ + return null + } const user:any = await this.collection.findOne({ "services.password.reset.token": token, }); @@ -253,6 +268,9 @@ export class Mongo implements DatabaseInterface { serviceName: string, serviceId: string ): Promise { + if(!isString(serviceId)){ + return null + } const user:any = await this.collection.findOne({ [`services.${serviceName}.id`]: serviceId, }); @@ -367,6 +385,9 @@ export class Mongo implements DatabaseInterface { } public async verifyMobile(userId: string, mobile: string): Promise { + if(!isString(mobile)){ + return null + } const id = this.options.convertUserIdToMongoObjectId ? toMongoID(userId) : userId; @@ -399,6 +420,9 @@ export class Mongo implements DatabaseInterface { } public async setMobile(userId: string, newMobile: string): Promise { + if(!isString(newMobile)){ + return null + } const id = this.options.convertUserIdToMongoObjectId ? toMongoID(userId) : userId; @@ -443,6 +467,9 @@ export class Mongo implements DatabaseInterface { } public async setEmail(userId: string, newEmail: string): Promise { + if(!isString(newEmail)){ + return null + } const id = this.options.convertUserIdToMongoObjectId ? toMongoID(userId) : userId; @@ -791,6 +818,9 @@ export class Mongo implements DatabaseInterface { EFFECTIVE_TIME ) { const now: any = new Date(); + if(!isString(name)){ + throw new Error('accounts.invalidCode') + } const query: any = { name: name, verifiedAt: null, diff --git a/packages/auth/package.json b/packages/auth/package.json index 6b2f746f7f..64407c1129 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/auth", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "lib/index.js", "scripts": { "watch": "tsc --watch", @@ -13,8 +13,8 @@ "access": "public" }, "dependencies": { - "@steedos/cachers": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/cachers": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "bcryptjs": "^2.4.3", "cookies": "^0.8.0", "express": "^4.16.4", @@ -26,5 +26,5 @@ "devDependencies": { "typescript": "4.6.3" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/cachers/package.json b/packages/cachers/package.json index 7c6468dfd3..ca8adf4102 100644 --- a/packages/cachers/package.json +++ b/packages/cachers/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/cachers", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "scripts": { @@ -19,5 +19,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 04e305f909..7a8327c52d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "steedos-cli", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Develop and run your enterprise apps in miniutes", "main": "dist/index.js", "scripts": { @@ -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.1-beta.16", - "@steedos/metadata-registrar": "2.7.1-beta.16", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/metadata-registrar": "2.7.1-beta.17", "archiver": "^5.0.2", "chalk": "2.4.2", "change-case": "^3.1.0", @@ -82,5 +82,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/client/package.json b/packages/client/package.json index 9b625df7c9..7ec6e3fcdd 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,7 +1,7 @@ { "private": false, "name": "@steedos/client", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "client lib for steedos", "main": "lib/index.js", "scripts": { @@ -17,8 +17,8 @@ }, "license": "MIT", "dependencies": { - "@steedos/filters": "2.7.1-beta.16", + "@steedos/filters": "2.7.1-beta.17", "node-fetch": "^2.6.7" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/core/package.json b/packages/core/package.json index efffa58d8a..bbc125a322 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/core", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "scripts": { @@ -14,15 +14,15 @@ "author": "", "license": "ISC", "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/filters": "2.7.1-beta.16", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/migrate": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/odata-v4-mongodb": "2.7.1-beta.16", - "@steedos/process": "2.7.1-beta.16", - "@steedos/standard-objects": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/filters": "2.7.1-beta.17", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/migrate": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/odata-v4-mongodb": "2.7.1-beta.17", + "@steedos/process": "2.7.1-beta.17", + "@steedos/standard-objects": "2.7.1-beta.17", "body-parser": "^1.18.1", "bunyan-sfdx-no-dtrace": "^1.8.2", "clone": "^2.1.2", @@ -45,7 +45,7 @@ "devDependencies": { "@salesforce/kit": "1.0.4", "@salesforce/ts-types": "1.1.2", - "@steedos/meteor-bundle-runner": "2.7.1-beta.16", + "@steedos/meteor-bundle-runner": "2.7.1-beta.17", "@types/express": "^4.16.1", "@types/node": "^11.10.4", "@types/underscore": "^1.8.13", @@ -57,5 +57,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/create-steedos-app/package.json b/packages/create-steedos-app/package.json index 54186c88b6..3bff0dfacb 100644 --- a/packages/create-steedos-app/package.json +++ b/packages/create-steedos-app/package.json @@ -1,6 +1,6 @@ { "name": "create-steedos-app", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "keywords": [ "react", "steedos" @@ -51,5 +51,5 @@ "engines": { "node": ">=14" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/create-steedos-package/package.json b/packages/create-steedos-package/package.json index f5e65ddd37..938cc1e809 100644 --- a/packages/create-steedos-package/package.json +++ b/packages/create-steedos-package/package.json @@ -1,6 +1,6 @@ { "name": "create-steedos-package", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "keywords": [ "steedos" ], @@ -39,5 +39,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/data-import/package.json b/packages/data-import/package.json index cdc678f8f2..c1ccb7dd58 100644 --- a/packages/data-import/package.json +++ b/packages/data-import/package.json @@ -1,16 +1,16 @@ { "name": "@steedos/data-import", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "lib/index.js", "license": "MIT", "scripts": { "build": "rm -rf ./lib && tsc" }, "dependencies": { - "@steedos/core": "2.7.1-beta.16", - "@steedos/metadata-api": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/core": "2.7.1-beta.17", + "@steedos/metadata-api": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "bson": "4.6.4", "csvtojson": "~2.0.10", "dotenv-flow": "^3.1.0", @@ -24,5 +24,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/filters/package.json b/packages/filters/package.json index f0cf395a37..6129670494 100644 --- a/packages/filters/package.json +++ b/packages/filters/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/filters", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "filters lib for steedos", "main": "lib/index.js", "files": [ @@ -36,5 +36,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/formula/package.json b/packages/formula/package.json index 0678dc94bb..cfea1c7623 100644 --- a/packages/formula/package.json +++ b/packages/formula/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/formula", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Salesforce Formula Parser", "main": "lib/formulon.js", "files": [ @@ -46,5 +46,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 06fdd352e4..fa5e62631d 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/i18n", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "scripts": { @@ -11,7 +11,7 @@ "author": "", "license": "ISC", "dependencies": { - "@steedos/cachers": "2.7.1-beta.16", + "@steedos/cachers": "2.7.1-beta.17", "i18next": "^19.3.4", "i18next-sprintf-postprocessor": "^0.2.2", "underscore": "1.13.4" @@ -22,5 +22,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/metadata-api/package.json b/packages/metadata-api/package.json index b38ef82c34..469291303b 100644 --- a/packages/metadata-api/package.json +++ b/packages/metadata-api/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/metadata-api", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "files": [ @@ -22,10 +22,10 @@ "access": "public" }, "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/core": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/core": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "chalk": "^4.1.0", "clone": "2.1.2", "compressing": "^1.5.1", @@ -37,9 +37,9 @@ "underscore": "^1.11.0" }, "devDependencies": { - "@steedos/service-meteor-package-loader": "2.7.1-beta.16", + "@steedos/service-meteor-package-loader": "2.7.1-beta.17", "javascript-obfuscator": "^2.9.1", "typescript": "4.6.3" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/metadata-core/package.json b/packages/metadata-core/package.json index d5fef5ead6..71e5a7e116 100644 --- a/packages/metadata-core/package.json +++ b/packages/metadata-core/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/metadata-core", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "files": [ @@ -12,7 +12,7 @@ "build": "tsc" }, "dependencies": { - "@steedos/client": "2.7.1-beta.16", + "@steedos/client": "2.7.1-beta.17", "archiver": "^5.1.0", "chalk": "^4.1.0", "clone": "^2.1.2", @@ -40,5 +40,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/metadata-registrar/package.json b/packages/metadata-registrar/package.json index 5d7a373751..d5bc6d9657 100644 --- a/packages/metadata-registrar/package.json +++ b/packages/metadata-registrar/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/metadata-registrar", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "files": [ @@ -13,8 +13,8 @@ }, "dependencies": { "@salesforce/ts-types": "1.1.2", - "@steedos/client": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", + "@steedos/client": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", "archiver": "^5.1.0", "chalk": "^4.1.0", "clone": "^2.1.2", @@ -41,5 +41,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/meteor-bundle-dependencies/package.json b/packages/meteor-bundle-dependencies/package.json index e0e10adee3..9b23be570f 100644 --- a/packages/meteor-bundle-dependencies/package.json +++ b/packages/meteor-bundle-dependencies/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/meteor-bundle-dependencies", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "index.js", "private": false, @@ -56,5 +56,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/meteor-bundle-runner/package.json b/packages/meteor-bundle-runner/package.json index 1bff0a5efd..016a5284f5 100644 --- a/packages/meteor-bundle-runner/package.json +++ b/packages/meteor-bundle-runner/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/meteor-bundle-runner", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Run meteor bundles and inject your own nodejs code.", "main": "index.js", "private": false, @@ -26,5 +26,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/migrate/package.json b/packages/migrate/package.json index df4b3ab60e..8ada32c735 100644 --- a/packages/migrate/package.json +++ b/packages/migrate/package.json @@ -1,17 +1,17 @@ { "name": "@steedos/migrate", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Migration scripts for steedos", "main": "index.js", "license": "MIT", "private": false, "dependencies": { - "@steedos/service-package-registry": "2.7.1-beta.16", + "@steedos/service-package-registry": "2.7.1-beta.17", "migrate": "^1.6.2", "mongodb": "^3.7.3" }, "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/objectql/package.json b/packages/objectql/package.json index f493f5ce8a..cee0818141 100644 --- a/packages/objectql/package.json +++ b/packages/objectql/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/objectql", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "scripts": { @@ -16,17 +16,17 @@ "dependencies": { "@salesforce/kit": "1.0.4", "@salesforce/ts-types": "1.1.1", - "@steedos/cachers": "2.7.1-beta.16", - "@steedos/filters": "2.7.1-beta.16", - "@steedos/formula": "2.7.1-beta.16", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/metadata-registrar": "2.7.1-beta.16", - "@steedos/odata-v4-mongodb": "2.7.1-beta.16", - "@steedos/odata-v4-sql": "2.7.1-beta.16", - "@steedos/odata-v4-typeorm": "2.7.1-beta.16", - "@steedos/schemas": "2.7.1-beta.16", - "@steedos/standard-objects": "2.7.1-beta.16", + "@steedos/cachers": "2.7.1-beta.17", + "@steedos/filters": "2.7.1-beta.17", + "@steedos/formula": "2.7.1-beta.17", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/metadata-registrar": "2.7.1-beta.17", + "@steedos/odata-v4-mongodb": "2.7.1-beta.17", + "@steedos/odata-v4-sql": "2.7.1-beta.17", + "@steedos/odata-v4-typeorm": "2.7.1-beta.17", + "@steedos/schemas": "2.7.1-beta.17", + "@steedos/standard-objects": "2.7.1-beta.17", "amis-formula": "~6.3.0", "app-root-path": "^2.2.1", "body-parser": "^1.18.1", @@ -56,7 +56,7 @@ "vm2": "^3.9.17" }, "devDependencies": { - "@steedos/meteor-bundle-runner": "2.7.1-beta.16", + "@steedos/meteor-bundle-runner": "2.7.1-beta.17", "@types/express": "^4.16.1", "@types/node": "^11.10.4", "@types/underscore": "^1.8.13", @@ -66,5 +66,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/objectql/src/types/object.ts b/packages/objectql/src/types/object.ts index 8415263a1a..c156f8b961 100644 --- a/packages/objectql/src/types/object.ts +++ b/packages/objectql/src/types/object.ts @@ -688,10 +688,7 @@ export class SteedosObjectType extends SteedosObjectProperties { params["userId"] = userSession["userId"]; params["spaceId"] = userSession["spaceId"]; } - const result = await runFunction(fDoc, { - getObject: getObject, - getUser: auth.getSessionByUserId - }, { + const result = await runFunction(fDoc, {}, { input: input, params: params, broker: broker, diff --git a/packages/odata-v4-mongodb/package.json b/packages/odata-v4-mongodb/package.json index 3e1a7d9327..6f7bf884a7 100644 --- a/packages/odata-v4-mongodb/package.json +++ b/packages/odata-v4-mongodb/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/odata-v4-mongodb", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Service OData requests from a MongoDB data store", "main": "lib/index.js", "directories": { @@ -26,12 +26,12 @@ }, "homepage": "https://github.com/jaystack/odata-v4-mongodb#readme", "dependencies": { - "@steedos/odata-v4-parser": "2.7.1-beta.16", + "@steedos/odata-v4-parser": "2.7.1-beta.17", "odata-v4-literal": "^0.1.0" }, "private": false, "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/odata-v4-parser/package.json b/packages/odata-v4-parser/package.json index e7472fd0c3..235dcb6c4c 100644 --- a/packages/odata-v4-parser/package.json +++ b/packages/odata-v4-parser/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/odata-v4-parser", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "OData v4 Parser", "main": "lib/parser.js", "repository": { @@ -20,5 +20,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/odata-v4-sql/package.json b/packages/odata-v4-sql/package.json index f677ee3ca7..5604b36bd1 100644 --- a/packages/odata-v4-sql/package.json +++ b/packages/odata-v4-sql/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/odata-v4-sql", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "OData to SQL query compiler", "main": "lib/index.js", "typings": "lib/index", @@ -27,7 +27,7 @@ }, "homepage": "https://github.com/jaystack/odata-v4-sql#readme", "dependencies": { - "@steedos/odata-v4-parser": "2.7.1-beta.16", + "@steedos/odata-v4-parser": "2.7.1-beta.17", "odata-v4-literal": "^0.1.0" }, "publishConfig": { @@ -36,5 +36,5 @@ "devDependencies": { "typescript": "4.6.3" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/odata-v4-typeorm/package.json b/packages/odata-v4-typeorm/package.json index b1d9a51134..cc50e21c30 100644 --- a/packages/odata-v4-typeorm/package.json +++ b/packages/odata-v4-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/odata-v4-typeorm", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "OData to TYPEORM query compiler", "main": "lib/index.js", "typings": "lib/index", @@ -29,12 +29,12 @@ }, "homepage": "https://github.com/steedos/odata-v4-typeorm#readme", "dependencies": { - "@steedos/odata-v4-parser": "2.7.1-beta.16", - "@steedos/odata-v4-sql": "2.7.1-beta.16", + "@steedos/odata-v4-parser": "2.7.1-beta.17", + "@steedos/odata-v4-sql": "2.7.1-beta.17", "odata-v4-literal": "^0.1.0" }, "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/plugin-company/package.json b/packages/plugin-company/package.json index 373b45e974..56052b7c30 100644 --- a/packages/plugin-company/package.json +++ b/packages/plugin-company/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/plugin-company", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Enterprise plugin for steedos", "main": "index.js", "repository": { @@ -17,5 +17,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/process/package.json b/packages/process/package.json index a3038dc567..a9f06cc2d9 100644 --- a/packages/process/package.json +++ b/packages/process/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/process", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "lib/index.js", "repository": "https://github.com/steedos/steedos-platform.git", "scripts": { @@ -16,9 +16,9 @@ "typescript": "4.6.3" }, "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "express": "4.18.1" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/router/package.json b/packages/router/package.json index 768aceea47..3eeb791442 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/router", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "scripts": { @@ -18,5 +18,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/schemas/object/schema.json b/packages/schemas/object/schema.json index d0b487f7e9..2c8760b2a6 100644 --- a/packages/schemas/object/schema.json +++ b/packages/schemas/object/schema.json @@ -156,6 +156,10 @@ "type": "boolean", "description": "允许单个字段编辑" }, + "enable_lock_detail": { + "type": "boolean", + "description": "当主表锁定时,所有子表只读。" + }, "is_view": { "type": "boolean", "description": "此对象是否对应数据库中的视图" diff --git a/packages/schemas/package.json b/packages/schemas/package.json index 2d92648153..b3ec53c725 100644 --- a/packages/schemas/package.json +++ b/packages/schemas/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/schemas", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "repository": "https://github.com/steedos/schemas.git", "author": "sunhaolin ", @@ -9,5 +9,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/active.field.yml b/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/active.field.yml index 9ed33a6b1e..370aa1da90 100644 --- a/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/active.field.yml +++ b/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/active.field.yml @@ -1,5 +1,5 @@ name: active -filterable: false +filterable: true hidden: false index: false is_name: false @@ -12,3 +12,4 @@ searchable: false sort_no: 150 sortable: false type: boolean + diff --git a/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/api_key.field.yml b/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/api_key.field.yml index 7ab5a6d161..e6d376d301 100644 --- a/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/api_key.field.yml +++ b/packages/standard-objects/api_keys-app/main/default/objects/api_keys/fields/api_key.field.yml @@ -1,5 +1,4 @@ name: api_key -filterable: false hidden: false index: false is_name: true @@ -8,8 +7,9 @@ label: API Key omit: false readonly: false required: false -searchable: false sort_no: 140 sortable: false type: text visible_on: "{{global.mode ==='read' ? true : false}}" +filterable: true +searchable: true diff --git a/packages/standard-objects/audit_records.object.yml b/packages/standard-objects/audit_records.object.yml index 8d7efe0c30..6efa3b5d31 100644 --- a/packages/standard-objects/audit_records.object.yml +++ b/packages/standard-objects/audit_records.object.yml @@ -25,6 +25,7 @@ fields: } } filterable: true + is_name: true created: label: "时间" filterable: true diff --git a/packages/standard-objects/autonumber.object.yml b/packages/standard-objects/autonumber.object.yml index 7fb040a756..ee4fe856a1 100644 --- a/packages/standard-objects/autonumber.object.yml +++ b/packages/standard-objects/autonumber.object.yml @@ -10,6 +10,8 @@ fields: index: true required: true is_name: true + filterable: true + searchable: true field_name: label: Field Name type: text @@ -30,6 +32,8 @@ fields: label: Rule type: text readonly: true + filterable: true + searchable: true visible_on: "{{global.mode ==='read' ? true : false}}" list_views: all: diff --git a/packages/standard-objects/business_hours.object.yml b/packages/standard-objects/business_hours.object.yml index 7eb87bff36..c25a4ab8ee 100644 --- a/packages/standard-objects/business_hours.object.yml +++ b/packages/standard-objects/business_hours.object.yml @@ -14,11 +14,13 @@ fields: required: true searchable: true index: true + filterable: true is_default: type: boolean label: Use as default inlineHelpText: 'Whether to use this working time as the default setting will only take effect if checked.' defaultValue: true + filterable: true start: type: text label: Start Time diff --git a/packages/standard-objects/cms_files/pages/preview.page.amis.json b/packages/standard-objects/cms_files/pages/preview.page.amis.json index 2dae00aad1..6d35803f77 100644 --- a/packages/standard-objects/cms_files/pages/preview.page.amis.json +++ b/packages/standard-objects/cms_files/pages/preview.page.amis.json @@ -10,7 +10,7 @@ }, { "type": "tabs", - "className": "steedos-record-tabs bg-white p-4 m-2 border rounded", + "className": "steedos-record-tabs bg-white p-4 sm:m-2 sm:border sm:rounded", "tabs": [ { "title": "预览", diff --git a/packages/standard-objects/holidays.object.yml b/packages/standard-objects/holidays.object.yml index 3ccf11a3b4..0e2f003fd4 100644 --- a/packages/standard-objects/holidays.object.yml +++ b/packages/standard-objects/holidays.object.yml @@ -13,6 +13,7 @@ fields: required: true searchable: true index: true + filterable: true type: label: Type type: select @@ -25,11 +26,13 @@ fields: value: adjusted_holiday - label: Adjusted Working Day value: adjusted_working_day + filterable: true date: label: Date type: date index: true required: true + filterable: true adjusted_to: label: Corresponding working day type: select diff --git a/packages/standard-objects/license.object.yml b/packages/standard-objects/license.object.yml index 9750c38f71..6bbbbaa263 100644 --- a/packages/standard-objects/license.object.yml +++ b/packages/standard-objects/license.object.yml @@ -12,6 +12,8 @@ fields: type: text label: Edition is_name: true + filterable: true + searchable: true license: type: textarea rows: 8 @@ -29,6 +31,8 @@ fields: product_label: type: text label: Product + filterable: true + searchable: true is_trial: type: boolean label: Trial @@ -52,12 +56,15 @@ fields: verify_status: type: select options: FAIL,SUCCESS + filterable: true invalid: type: boolean label: Invalid hidden: true lid: type: text + filterable: true + searchable: true verify_error: type: textarea hidden: true diff --git a/packages/standard-objects/object_workflows.object.yml b/packages/standard-objects/object_workflows.object.yml index a92c1cae37..f3931824b1 100644 --- a/packages/standard-objects/object_workflows.object.yml +++ b/packages/standard-objects/object_workflows.object.yml @@ -8,6 +8,8 @@ fields: label: Name type: text required: true + searchable: true + filterable: true object_name: label: Object type: master_detail @@ -16,11 +18,13 @@ fields: reference_to: objects reference_to_field: name filters: [["enable_workflow", "=", true]] + filterable: true flow_id: label: Workflow type: lookup required: true reference_to: flows + filterable: true field_map: label: Field Mappings(from Object to Workflow) type: table diff --git a/packages/standard-objects/package.json b/packages/standard-objects/package.json index 5bff0d490a..0a1c224f45 100644 --- a/packages/standard-objects/package.json +++ b/packages/standard-objects/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/standard-objects", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Standard objects for steedos", "main": "index.js", "license": "Apache", @@ -9,14 +9,14 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/core": "2.7.1-beta.16", - "@steedos/filters": "2.7.1-beta.16", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/metadata-registrar": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/core": "2.7.1-beta.17", + "@steedos/filters": "2.7.1-beta.17", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/metadata-registrar": "2.7.1-beta.17", "clone": "^2.1.2" } } diff --git a/packages/standard-objects/queue/queue_import/queue_import.object.yml b/packages/standard-objects/queue/queue_import/queue_import.object.yml index 711de75b59..bc2e0be058 100644 --- a/packages/standard-objects/queue/queue_import/queue_import.object.yml +++ b/packages/standard-objects/queue/queue_import/queue_import.object.yml @@ -13,6 +13,7 @@ fields: searchable: true sort_no: 10 type: text + filterable: true description: label: Description type: text @@ -21,6 +22,7 @@ fields: is_name: true name: description searchable: true + filterable: true object_name: label: Object type: lookup @@ -56,7 +58,6 @@ fields: readonly: true visible_on: "{{global.mode ==='read' ? true : false}}" name: encoding - filterable: true value_separator: label: Separator type: select @@ -67,7 +68,6 @@ fields: visible_on: "{{global.mode ==='read' ? true : false}}" defaultValue: '","' name: value_separator - filterable: true operation: type: select @@ -80,6 +80,7 @@ fields: - label: upsert value: upsert required: true + filterable: true fire_workflows: name: fire_workflows label: Fire Workflows @@ -93,7 +94,6 @@ fields: defaultIcon: service_contract required: true name: field_mappings - filterable: true amis: showIndex: true, enableDialog: false @@ -168,7 +168,6 @@ fields: visible_on: "{{formData.operation != 'insert' ? true : false}}" required: true name: external_id_name - filterable: true template_url: label: 导入模板 type: url @@ -202,12 +201,11 @@ list_views: all: label: All Queues columns: - - name - description + - name - object_name + - operation - template_url - - encoding - - is_system filter_scope: space permission_set: user: diff --git a/packages/standard-objects/queue/queue_import_history.object.yml b/packages/standard-objects/queue/queue_import_history.object.yml index f579b43490..0681466e1f 100644 --- a/packages/standard-objects/queue/queue_import_history.object.yml +++ b/packages/standard-objects/queue/queue_import_history.object.yml @@ -82,7 +82,6 @@ list_views: all: label: All Queues columns: - - object_name - queue_import - success_count - failure_count diff --git a/packages/standard-objects/roles.object.yml b/packages/standard-objects/roles.object.yml index d98cf652b8..600245bef3 100644 --- a/packages/standard-objects/roles.object.yml +++ b/packages/standard-objects/roles.object.yml @@ -9,23 +9,27 @@ fields: type: text required: true searchable: true + filterable: true api_name: type: text label: API Name required: true searchable: true name: api_name + filterable: true parent: label: Parent Role type: lookup reference_to: roles reference_to_field: api_name + filterable: true users: label: Users type: lookup reference_to: users multiple: true is_wide: true + filterable: true description: label: Description type: textarea diff --git a/packages/standard-objects/sessions.object.yml b/packages/standard-objects/sessions.object.yml index da35a1863b..b7463892a7 100644 --- a/packages/standard-objects/sessions.object.yml +++ b/packages/standard-objects/sessions.object.yml @@ -12,6 +12,8 @@ fields: type: lookup reference_to: users required: true + filterable: true + is_name: true token: label: Token type: text @@ -22,15 +24,19 @@ fields: ip: label: IP Address type: text + filterable: true + searchable: true valid: label: valid type: boolean is_phone: label: 手机 type: boolean + filterable: true is_tablet: label: 平板电脑 type: boolean + filterable: true client_id: label: Client ID type: text @@ -40,6 +46,7 @@ fields: reference_to: connected_apps modified: label: Last Login Time + filterable: true created: label: First Login Time list_views: diff --git a/packages/standard-objects/workflow/categories.object.yml b/packages/standard-objects/workflow/categories.object.yml index 2dd9c09bb7..ed67a84772 100644 --- a/packages/standard-objects/workflow/categories.object.yml +++ b/packages/standard-objects/workflow/categories.object.yml @@ -11,6 +11,7 @@ fields: name: name searchable: true required: true + filterable: true app: label: Apps type: lookup diff --git a/packages/standard-objects/workflow/flow_roles.object.yml b/packages/standard-objects/workflow/flow_roles.object.yml index 6d61b0db30..b2a5c96903 100644 --- a/packages/standard-objects/workflow/flow_roles.object.yml +++ b/packages/standard-objects/workflow/flow_roles.object.yml @@ -11,12 +11,14 @@ fields: label: Name name: name searchable: true + filterable: true api_name: type: text label: API Name required: true searchable: true name: api_name + filterable: true # company_id: # required: false # omit: false diff --git a/packages/standard-objects/workflow/flows.object.yml b/packages/standard-objects/workflow/flows.object.yml index 27716f097c..3e97173f58 100644 --- a/packages/standard-objects/workflow/flows.object.yml +++ b/packages/standard-objects/workflow/flows.object.yml @@ -13,6 +13,7 @@ fields: searchable: true # readonly: true name: name + filterable: true api_name: type: text label: Api Name @@ -20,6 +21,7 @@ fields: inlineHelpText: "配置了Api Name 的流程才能同步为元数据" searchable: true name: api_name + filterable: true form: label: Form type: lookup @@ -27,7 +29,6 @@ fields: readonly: true visible_on: "{{global.mode !='read' ? false : true}}" name: form - filterable: true category: label: Category type: lookup diff --git a/packages/standard-objects/workflow/instance_number_rules.object.yml b/packages/standard-objects/workflow/instance_number_rules.object.yml index d89a3b18c2..ece3b29df8 100644 --- a/packages/standard-objects/workflow/instance_number_rules.object.yml +++ b/packages/standard-objects/workflow/instance_number_rules.object.yml @@ -11,6 +11,7 @@ fields: required: true name: name searchable: true + filterable: true year: type: number label: Year @@ -33,6 +34,8 @@ fields: label: Appearance Formular required: true name: rules + searchable: true + filterable: true # company_id: # required: false # omit: false @@ -47,6 +50,10 @@ list_views: - number - rules label: All Rules + searchable_fields: + - field: name + - field: rules + - field: company_id permission_set: user: allowCreate: false diff --git a/packages/standard-objects/workflow/instances_statistic.object.yml b/packages/standard-objects/workflow/instances_statistic.object.yml index df1e63a4bb..7219248d15 100644 --- a/packages/standard-objects/workflow/instances_statistic.object.yml +++ b/packages/standard-objects/workflow/instances_statistic.object.yml @@ -10,14 +10,17 @@ fields: reference_to: users name: user filterable: true + is_name: true year: type: number label: Year name: year + filterable: true month: type: number label: Month name: month + filterable: true month_finished_count: type: number label: Total Number of Processed Instances diff --git a/packages/standard-objects/workflow/process_delegation_rules.object.yml b/packages/standard-objects/workflow/process_delegation_rules.object.yml index 8283d82a71..102d8f2967 100644 --- a/packages/standard-objects/workflow/process_delegation_rules.object.yml +++ b/packages/standard-objects/workflow/process_delegation_rules.object.yml @@ -14,6 +14,7 @@ fields: defaultValue: "{{ global.userId }}" visible_on: "{{global.mode ==='read' ? true : false}}" name: from + is_name: true filterable: true to: type: lookup @@ -28,11 +29,13 @@ fields: label: Start Time required: true name: start_time + filterable: true end_time: type: datetime label: End Time required: true name: end_time + filterable: true enabled: type: boolean label: Enabled diff --git a/packages/standard-objects/workflow/space_user_signs.object.yml b/packages/standard-objects/workflow/space_user_signs.object.yml index b5393785d3..607b0fb597 100644 --- a/packages/standard-objects/workflow/space_user_signs.object.yml +++ b/packages/standard-objects/workflow/space_user_signs.object.yml @@ -13,6 +13,7 @@ fields: name: user filterable: true searchable: true + is_name: true sign: type: avatar label: Sign diff --git a/packages/standard-objects/workflow/webhooks.object.yml b/packages/standard-objects/workflow/webhooks.object.yml index e031ac330c..fc2a992a5c 100644 --- a/packages/standard-objects/workflow/webhooks.object.yml +++ b/packages/standard-objects/workflow/webhooks.object.yml @@ -16,6 +16,7 @@ fields: is_wide: true is_name: true name: name + filterable: true flow: label: Workflow type: lookup @@ -32,6 +33,7 @@ fields: required: true is_wide: true name: payload_url + filterable: true content_type: label: Format of Request type: text @@ -43,6 +45,7 @@ fields: type: boolean defaultValue: false name: active + filterable: true description: type: text label: Description diff --git a/packages/steedos-plugin-schema-builder/package.json b/packages/steedos-plugin-schema-builder/package.json index cdf5870641..986925ae7c 100644 --- a/packages/steedos-plugin-schema-builder/package.json +++ b/packages/steedos-plugin-schema-builder/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/steedos-plugin-schema-builder", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Add Schema Builder to Steedos Object Manager.", "main": "index.js", "author": "", @@ -10,5 +10,5 @@ "access": "public" }, "homepage": "https://github.com/steedos/steedos-platform/tree/master/packages/steedos-plugin-schema-builder", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/utils/package.json b/packages/utils/package.json index bbe5060b29..2dbe945d4b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/utils", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/index.js", "scripts": { @@ -20,5 +20,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/packages/workflow/package.json b/packages/workflow/package.json index 20ccb78288..60c649eaf7 100644 --- a/packages/workflow/package.json +++ b/packages/workflow/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/workflow", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "repository": "https://github.com/steedos/steedos-platform/packages/workflow.git", "author": "sunhaolin ", @@ -10,18 +10,18 @@ "access": "public" }, "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "@steedos/steedos-plugin-workflow": "^2.1.5", "body-parser": "^1.19.0", "express": "^4.17.1", "underscore": "^1.9.1" }, "devDependencies": { - "@steedos/core": "2.7.1-beta.16", - "@steedos/meteor-bundle-runner": "2.7.1-beta.16", - "steedos-server": "2.7.1-beta.16" + "@steedos/core": "2.7.1-beta.17", + "@steedos/meteor-bundle-runner": "2.7.1-beta.17", + "steedos-server": "2.7.1-beta.17" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/server/package.json b/server/package.json index 27a65aff84..d296fb84ca 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "steedos-server", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "files": [ "/bundle/programs/server/app", @@ -19,19 +19,19 @@ }, "dependencies": { "@babel/runtime": "7.12.18", - "@steedos/accounts": "2.7.1-beta.16", - "@steedos/auth": "2.7.1-beta.16", - "@steedos/core": "2.7.1-beta.16", - "@steedos/filters": "2.7.1-beta.16", + "@steedos/accounts": "2.7.1-beta.17", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/core": "2.7.1-beta.17", + "@steedos/filters": "2.7.1-beta.17", "@steedos/form-builder": "3.6.2-patch.5", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/meteor-bundle-dependencies": "2.7.1-beta.16", - "@steedos/meteor-bundle-runner": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/odata-v4-mongodb": "2.7.1-beta.16", - "@steedos/odata-v4-parser": "2.7.1-beta.16", - "@steedos/process": "2.7.1-beta.16", - "@steedos/standard-objects": "2.7.1-beta.16", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/meteor-bundle-dependencies": "2.7.1-beta.17", + "@steedos/meteor-bundle-runner": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/odata-v4-mongodb": "2.7.1-beta.17", + "@steedos/odata-v4-parser": "2.7.1-beta.17", + "@steedos/process": "2.7.1-beta.17", + "@steedos/standard-objects": "2.7.1-beta.17", "@steedos/webapp": "2.2.25", "basic-auth": "^2.0.1", "bcryptjs": "^2.4.3", @@ -87,5 +87,5 @@ "xiaomi-push": "^1.0.0", "xml2js": "^0.4.19" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-accounts/package.json b/services/service-accounts/package.json index 257568cf59..4ad44c6889 100644 --- a/services/service-accounts/package.json +++ b/services/service-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-accounts", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "license": "MIT", "dependencies": { @@ -10,5 +10,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-ancillary/package.json b/services/service-ancillary/package.json index f88b2fdd12..80bff68188 100644 --- a/services/service-ancillary/package.json +++ b/services/service-ancillary/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-ancillary", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "package.service.js", "scripts": { @@ -17,5 +17,5 @@ "express-xml-bodyparser": "0.3.0", "xml2js": "0.4.23" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-api/package.json b/services/service-api/package.json index e0d79d585c..609b5722cc 100644 --- a/services/service-api/package.json +++ b/services/service-api/package.json @@ -1,13 +1,13 @@ { "name": "@steedos/service-api", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "license": "MIT", "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/router": "2.7.1-beta.16", - "@steedos/service-object-graphql": "2.7.1-beta.16", - "@steedos/service-ui": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/router": "2.7.1-beta.17", + "@steedos/service-object-graphql": "2.7.1-beta.17", + "@steedos/service-ui": "2.7.1-beta.17", "graphql": "^15.8.0", "graphql-iso-date": "^3.6.1", "graphql-type-json": "^0.3.2", @@ -22,7 +22,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "devDependencies": { "@types/graphql-iso-date": "^3.4.0", "@types/react-dev-utils": "^9.0.11" diff --git a/services/service-bull-dashboard/package.json b/services/service-bull-dashboard/package.json index 13381e93df..047834f8db 100644 --- a/services/service-bull-dashboard/package.json +++ b/services/service-bull-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-bull-dashboard", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "package.service.js", "license": "MIT", @@ -10,10 +10,10 @@ }, "dependencies": { "@bull-board/express": "^4.6.4", - "@steedos/auth": "2.7.1-beta.16", - "@steedos/router": "2.7.1-beta.16", - "@steedos/service-package-loader": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/router": "2.7.1-beta.17", + "@steedos/service-package-loader": "2.7.1-beta.17", "bullmq": "5.7.4" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-cachers-manager/package.json b/services/service-cachers-manager/package.json index 1f116f5063..d83dd782d0 100644 --- a/services/service-cachers-manager/package.json +++ b/services/service-cachers-manager/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-cachers-manager", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "license": "MIT", "private": false, @@ -8,12 +8,12 @@ "build": "rm -rf ./lib && tsc" }, "dependencies": { - "@steedos/cachers": "2.7.1-beta.16", - "@steedos/metadata-registrar": "2.7.1-beta.16", - "@steedos/utils": "2.7.1-beta.16" + "@steedos/cachers": "2.7.1-beta.17", + "@steedos/metadata-registrar": "2.7.1-beta.17", + "@steedos/utils": "2.7.1-beta.17" }, "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-charts/package.json b/services/service-charts/package.json index 0ff15982f1..dcf3310e98 100644 --- a/services/service-charts/package.json +++ b/services/service-charts/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/service-charts", "private": false, - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "Connect to the database and execute custom queries.", "main": "package.service.js", "repository": { @@ -17,9 +17,9 @@ "pub_next": "npm publish --tag next --registry https://registry.npmjs.org && start https://npm.taobao.org/sync/@steedos/app-admin" }, "devDependencies": { - "@steedos/service-metadata-server": "2.7.1-beta.16", - "@steedos/service-package-loader": "2.7.1-beta.16", - "@steedos/service-steedos-server": "2.7.1-beta.16", + "@steedos/service-metadata-server": "2.7.1-beta.17", + "@steedos/service-package-loader": "2.7.1-beta.17", + "@steedos/service-steedos-server": "2.7.1-beta.17", "clone": "^2.1.2", "cross-env": "^7.0.3", "dotenv-flow": "^3.2.0", @@ -35,7 +35,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { "duration": "^0.2.2", "json2csv": "5.0.6", diff --git a/services/service-community/package.json b/services/service-community/package.json index c4b38ba738..95a1746155 100644 --- a/services/service-community/package.json +++ b/services/service-community/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/service-community", "main": "package.service.js", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "private": false, "repository": "https://github.com/steedos/steedos-platform.git", "description": "", @@ -12,27 +12,27 @@ "license": "MIT", "dependencies": { "@steedos-builder/amis-editor": "6.3.0-beta.11", - "@steedos/ee_sso-oidc": "2.7.1-beta.16", - "@steedos/service-analytics": "2.7.1-beta.16", - "@steedos/service-ancillary": "2.7.1-beta.16", - "@steedos/service-charts": "2.7.1-beta.16", - "@steedos/service-i18n": "2.7.1-beta.16", - "@steedos/service-identity-jwt": "2.7.1-beta.16", - "@steedos/service-metadata-server": "2.7.1-beta.16", - "@steedos/service-mongodb-server": "2.7.1-beta.16", - "@steedos/service-objectql": "2.7.1-beta.16", - "@steedos/service-package-loader": "2.7.1-beta.16", - "@steedos/service-package-registry": "2.7.1-beta.16", - "@steedos/service-package-tool": "2.7.1-beta.16", - "@steedos/service-pages": "2.7.1-beta.16", - "@steedos/service-rest": "2.7.1-beta.16", - "@steedos/service-saas": "2.7.1-beta.16", - "@steedos/service-sentry": "2.7.1-beta.16", - "@steedos/service-sidecar": "2.7.1-beta.16", - "@steedos/service-steedos-server": "2.7.1-beta.16", - "@steedos/steedos-plugin-schema-builder": "2.7.1-beta.16", - "@steedos/unpkg": "2.7.1-beta.16", - "@steedos/workflow_time_trigger": "2.7.1-beta.16", + "@steedos/ee_sso-oidc": "2.7.1-beta.17", + "@steedos/service-analytics": "2.7.1-beta.17", + "@steedos/service-ancillary": "2.7.1-beta.17", + "@steedos/service-charts": "2.7.1-beta.17", + "@steedos/service-i18n": "2.7.1-beta.17", + "@steedos/service-identity-jwt": "2.7.1-beta.17", + "@steedos/service-metadata-server": "2.7.1-beta.17", + "@steedos/service-mongodb-server": "2.7.1-beta.17", + "@steedos/service-objectql": "2.7.1-beta.17", + "@steedos/service-package-loader": "2.7.1-beta.17", + "@steedos/service-package-registry": "2.7.1-beta.17", + "@steedos/service-package-tool": "2.7.1-beta.17", + "@steedos/service-pages": "2.7.1-beta.17", + "@steedos/service-rest": "2.7.1-beta.17", + "@steedos/service-saas": "2.7.1-beta.17", + "@steedos/service-sentry": "2.7.1-beta.17", + "@steedos/service-sidecar": "2.7.1-beta.17", + "@steedos/service-steedos-server": "2.7.1-beta.17", + "@steedos/steedos-plugin-schema-builder": "2.7.1-beta.17", + "@steedos/unpkg": "2.7.1-beta.17", + "@steedos/workflow_time_trigger": "2.7.1-beta.17", "aliyun-sdk": "1.12.3", "async-retry": "^1.3.1", "axios": "^0.21.1", @@ -65,7 +65,7 @@ "randomcolor": "^0.6.2", "randomstring": "^1.2.1", "redlock": "^4.2.0", - "steedos-cli": "2.7.1-beta.16", + "steedos-cli": "2.7.1-beta.17", "tslib": "^2.4.0", "validator": "^13.6.0" }, @@ -73,5 +73,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-fields-indexs/package.json b/services/service-fields-indexs/package.json index e0c50bee6e..ff159a7ef5 100644 --- a/services/service-fields-indexs/package.json +++ b/services/service-fields-indexs/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-fields-indexs", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "license": "MIT", "dependencies": { @@ -10,5 +10,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-files/package.json b/services/service-files/package.json index 3527ef599c..4c26bed07d 100644 --- a/services/service-files/package.json +++ b/services/service-files/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-files", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": {}, "license": "MIT", @@ -9,7 +9,7 @@ "access": "public" }, "dependencies": { - "@steedos/utils": "2.7.1-beta.16", + "@steedos/utils": "2.7.1-beta.17", "aws-sdk": "2.0.23", "file-type": "16.5.4", "formidable": "2.0.1", @@ -17,5 +17,5 @@ "mkdirp": "^1.0.4", "moment": "^2.29.1" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-i18n/package.json b/services/service-i18n/package.json index a7b1a89639..6b65f48687 100644 --- a/services/service-i18n/package.json +++ b/services/service-i18n/package.json @@ -1,7 +1,7 @@ { "name": "@steedos/service-i18n", "main": "package.service.js", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "private": false, "repository": "https://github.com/steedos/steedos-platform.git", "description": "", @@ -14,5 +14,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-identity-jwt/package.json b/services/service-identity-jwt/package.json index 73b639a624..6482a1ac6b 100644 --- a/services/service-identity-jwt/package.json +++ b/services/service-identity-jwt/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-identity-jwt", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "keywords": [ "steedos" @@ -11,7 +11,7 @@ "description": "steedos package", "repository": {}, "dependencies": { - "@steedos/accounts": "2.7.1-beta.16", + "@steedos/accounts": "2.7.1-beta.17", "express": "4.18.1", "jsonwebtoken": "8.5.1", "passport": "^0.6.0", @@ -22,5 +22,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-apps/package.json b/services/service-metadata-apps/package.json index 1fcd1b6b53..57037cdbdd 100644 --- a/services/service-metadata-apps/package.json +++ b/services/service-metadata-apps/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata-apps", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/apps.service.js", "scripts": { @@ -19,8 +19,8 @@ "author": "", "license": "MIT", "dependencies": { - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "dotenv-flow": "^3.1.0", "ioredis": "^4.22.0", "lodash": "^4.17.21", @@ -34,5 +34,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-layouts/package.json b/services/service-metadata-layouts/package.json index 7a1d5d2048..886b614f6a 100644 --- a/services/service-metadata-layouts/package.json +++ b/services/service-metadata-layouts/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata-layouts", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/layouts.service.js", "scripts": { @@ -33,5 +33,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-objects/package.json b/services/service-metadata-objects/package.json index 3c474beacf..1771ed095b 100644 --- a/services/service-metadata-objects/package.json +++ b/services/service-metadata-objects/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata-objects", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/objects.service.js", "scripts": { @@ -20,9 +20,9 @@ "license": "MIT", "dependencies": { "@salesforce/ts-types": "1.1.2", - "@steedos/formula": "2.7.1-beta.16", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/metadata-registrar": "2.7.1-beta.16", + "@steedos/formula": "2.7.1-beta.17", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/metadata-registrar": "2.7.1-beta.17", "dotenv-flow": "^3.1.0", "ioredis": "^4.22.0", "lodash": "^4.17.21", @@ -37,5 +37,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-permissionsets/package.json b/services/service-metadata-permissionsets/package.json index 2f1c00653a..d492e64f30 100644 --- a/services/service-metadata-permissionsets/package.json +++ b/services/service-metadata-permissionsets/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata-permissionsets", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/permissionsets.service.js", "scripts": { @@ -32,5 +32,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-server/package.json b/services/service-metadata-server/package.json index 62931dc86c..573ef430bc 100644 --- a/services/service-metadata-server/package.json +++ b/services/service-metadata-server/package.json @@ -1,22 +1,22 @@ { "name": "@steedos/service-metadata-server", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "license": "MIT", "scripts": { "build": "rm -rf ./lib && tsc" }, "dependencies": { - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/service-metadata": "2.7.1-beta.16", - "@steedos/service-metadata-apps": "2.7.1-beta.16", - "@steedos/service-metadata-layouts": "2.7.1-beta.16", - "@steedos/service-metadata-objects": "2.7.1-beta.16", - "@steedos/service-metadata-permissionsets": "2.7.1-beta.16", - "@steedos/service-metadata-tabs": "2.7.1-beta.16", - "@steedos/service-metadata-translations": "2.7.1-beta.16", - "@steedos/service-metadata-triggers": "2.7.1-beta.16", - "@steedos/service-packages": "2.7.1-beta.16", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/service-metadata": "2.7.1-beta.17", + "@steedos/service-metadata-apps": "2.7.1-beta.17", + "@steedos/service-metadata-layouts": "2.7.1-beta.17", + "@steedos/service-metadata-objects": "2.7.1-beta.17", + "@steedos/service-metadata-permissionsets": "2.7.1-beta.17", + "@steedos/service-metadata-tabs": "2.7.1-beta.17", + "@steedos/service-metadata-translations": "2.7.1-beta.17", + "@steedos/service-metadata-triggers": "2.7.1-beta.17", + "@steedos/service-packages": "2.7.1-beta.17", "lodash": "^4.17.21", "underscore": "1.13.4" }, @@ -27,5 +27,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-tabs/package.json b/services/service-metadata-tabs/package.json index d71b0b2d21..3c49c4d260 100644 --- a/services/service-metadata-tabs/package.json +++ b/services/service-metadata-tabs/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata-tabs", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/tabs.service.js", "scripts": { @@ -32,5 +32,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-translations/package.json b/services/service-metadata-translations/package.json index c93c81829d..a8905a0806 100644 --- a/services/service-metadata-translations/package.json +++ b/services/service-metadata-translations/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata-translations", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/translations.service.js", "scripts": { @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@steedos/metadata-registrar": "2.7.1-beta.16", + "@steedos/metadata-registrar": "2.7.1-beta.17", "dotenv-flow": "^3.1.0", "ioredis": "^4.22.0", "lodash": "^4.17.21", @@ -33,5 +33,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata-triggers/package.json b/services/service-metadata-triggers/package.json index b2fca6513f..264e2a073b 100644 --- a/services/service-metadata-triggers/package.json +++ b/services/service-metadata-triggers/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata-triggers", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/triggers2.service.js", "scripts": { @@ -33,5 +33,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-metadata/package.json b/services/service-metadata/package.json index 7de8adc1a5..8b7f00d27a 100644 --- a/services/service-metadata/package.json +++ b/services/service-metadata/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-metadata", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "lib/metadata.service.js", "scripts": { @@ -18,7 +18,7 @@ "author": "", "license": "MIT", "dependencies": { - "@steedos/metadata-registrar": "2.7.1-beta.16", + "@steedos/metadata-registrar": "2.7.1-beta.17", "dotenv-flow": "^3.1.0", "ioredis": "^4.22.0", "lodash": "^4.17.21", @@ -33,5 +33,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-meteor-package-loader/package.json b/services/service-meteor-package-loader/package.json index bb7521a5cc..8878b526f2 100644 --- a/services/service-meteor-package-loader/package.json +++ b/services/service-meteor-package-loader/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-meteor-package-loader", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "index.js", "scripts": { @@ -10,10 +10,10 @@ "author": "", "license": "MIT", "dependencies": { - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/router": "2.7.1-beta.16", - "@steedos/service-package-loader": "2.7.1-beta.16", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/router": "2.7.1-beta.17", + "@steedos/service-package-loader": "2.7.1-beta.17", "clone": "^2.1.2", "moleculer": "^0.14.25", "moment": "^2.24.0", @@ -26,5 +26,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-mongodb-server/package.json b/services/service-mongodb-server/package.json index ce2dfe5dfa..5a23effe91 100644 --- a/services/service-mongodb-server/package.json +++ b/services/service-mongodb-server/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-mongodb-server", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "license": "MIT", "dependencies": { @@ -10,5 +10,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-node-red/package.json b/services/service-node-red/package.json index 157e432bc0..5bdf94981c 100644 --- a/services/service-node-red/package.json +++ b/services/service-node-red/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-node-red", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "scripts": { "start": "moleculer-runner --repl --hot ./index.js" @@ -13,5 +13,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-object-graphql/package.json b/services/service-object-graphql/package.json index f83208607f..a7ede82e9e 100644 --- a/services/service-object-graphql/package.json +++ b/services/service-object-graphql/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-object-graphql", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -15,12 +15,12 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { - "@steedos/filters": "2.7.1-beta.16", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/service-object-mixin": "2.7.1-beta.16", + "@steedos/filters": "2.7.1-beta.17", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/service-object-mixin": "2.7.1-beta.17", "graphql": "^15.8.0", "graphql-parse-resolve-info": "^4.12.3", "moleculer": "^0.14.25", diff --git a/services/service-object-mixin/package.json b/services/service-object-mixin/package.json index d8536cb671..b2c754eb33 100644 --- a/services/service-object-mixin/package.json +++ b/services/service-object-mixin/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-object-mixin", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -10,11 +10,11 @@ "steedos" ], "dependencies": { - "@steedos/utils": "2.7.1-beta.16" + "@steedos/utils": "2.7.1-beta.17" }, "scripts": {}, "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-objectql/package.json b/services/service-objectql/package.json index 777a9b44e2..2f2b76812e 100644 --- a/services/service-objectql/package.json +++ b/services/service-objectql/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-objectql", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -13,8 +13,8 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { - "@steedos/objectql": "2.7.1-beta.16" + "@steedos/objectql": "2.7.1-beta.17" } } diff --git a/services/service-package-loader/package.json b/services/service-package-loader/package.json index 75d9b35106..b2bc49bd36 100644 --- a/services/service-package-loader/package.json +++ b/services/service-package-loader/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-package-loader", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "index.js", "scripts": { @@ -10,10 +10,10 @@ "author": "", "license": "MIT", "dependencies": { - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/metadata-registrar": "2.7.1-beta.16", - "@steedos/router": "2.7.1-beta.16", - "@steedos/service-object-mixin": "2.7.1-beta.16", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/metadata-registrar": "2.7.1-beta.17", + "@steedos/router": "2.7.1-beta.17", + "@steedos/service-object-mixin": "2.7.1-beta.17", "clone": "^2.1.2", "csvtojson": "~2.0.10", "moleculer": "^0.14.25", @@ -28,5 +28,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-package-registry/main/default/objects/steedos_packages/fields/description.field.yml b/services/service-package-registry/main/default/objects/steedos_packages/fields/description.field.yml index c4fb7b227a..80060429c6 100644 --- a/services/service-package-registry/main/default/objects/steedos_packages/fields/description.field.yml +++ b/services/service-package-registry/main/default/objects/steedos_packages/fields/description.field.yml @@ -1,5 +1,5 @@ name: description -filterable: false +filterable: true hidden: false index: false is_name: false @@ -9,7 +9,7 @@ omit: false readonly: false required: false rows: 2 -searchable: false +searchable: true sort_no: 450 sortable: false type: textarea diff --git a/services/service-package-registry/main/default/objects/steedos_packages/fields/label.field.yml b/services/service-package-registry/main/default/objects/steedos_packages/fields/label.field.yml index e8800b0f73..64f82bb36e 100644 --- a/services/service-package-registry/main/default/objects/steedos_packages/fields/label.field.yml +++ b/services/service-package-registry/main/default/objects/steedos_packages/fields/label.field.yml @@ -1,5 +1,5 @@ name: label -filterable: false +filterable: true hidden: false index: true is_name: true @@ -12,3 +12,5 @@ searchable: true sort_no: 100 sortable: true type: text + + diff --git a/services/service-package-registry/main/default/objects/steedos_packages/fields/name.field.yml b/services/service-package-registry/main/default/objects/steedos_packages/fields/name.field.yml index 586f891c74..0ab90748cb 100644 --- a/services/service-package-registry/main/default/objects/steedos_packages/fields/name.field.yml +++ b/services/service-package-registry/main/default/objects/steedos_packages/fields/name.field.yml @@ -1,5 +1,5 @@ name: name -filterable: false +filterable: true hidden: false index: true is_name: false @@ -12,3 +12,4 @@ searchable: true sort_no: 100 sortable: true type: text + diff --git a/services/service-package-registry/main/default/objects/steedos_packages/fields/status.field.yml b/services/service-package-registry/main/default/objects/steedos_packages/fields/status.field.yml index a82c30b7aa..4701784c92 100644 --- a/services/service-package-registry/main/default/objects/steedos_packages/fields/status.field.yml +++ b/services/service-package-registry/main/default/objects/steedos_packages/fields/status.field.yml @@ -1,5 +1,5 @@ name: status -filterable: false +filterable: true hidden: false index: true is_name: false diff --git a/services/service-package-registry/main/default/objects/steedos_packages/fields/version.field.yml b/services/service-package-registry/main/default/objects/steedos_packages/fields/version.field.yml index 14bbab990a..3786905cf3 100644 --- a/services/service-package-registry/main/default/objects/steedos_packages/fields/version.field.yml +++ b/services/service-package-registry/main/default/objects/steedos_packages/fields/version.field.yml @@ -1,5 +1,5 @@ name: version -filterable: false +filterable: true hidden: false index: false is_name: false @@ -12,3 +12,4 @@ searchable: true sort_no: 110 sortable: true type: text + diff --git a/services/service-package-registry/package.json b/services/service-package-registry/package.json index 6e26c2dea5..ac08ac37b0 100644 --- a/services/service-package-registry/package.json +++ b/services/service-package-registry/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-package-registry", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "package.service.js", "scripts": { @@ -9,11 +9,11 @@ "author": "", "license": "ISC", "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/core": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/service-package-loader": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/core": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/service-package-loader": "2.7.1-beta.17", "clone": "^2.1.2", "fs-extra": "8.1.0", "i18next": "20.3.2", @@ -32,5 +32,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-package-tool/package.json b/services/service-package-tool/package.json index d8a734da66..5291fb8877 100644 --- a/services/service-package-tool/package.json +++ b/services/service-package-tool/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-package-tool", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "", "main": "package.service.js", "scripts": { @@ -9,11 +9,11 @@ "author": "", "license": "ISC", "dependencies": { - "@steedos/auth": "2.7.1-beta.16", - "@steedos/core": "2.7.1-beta.16", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/service-package-loader": "2.7.1-beta.16", + "@steedos/auth": "2.7.1-beta.17", + "@steedos/core": "2.7.1-beta.17", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/service-package-loader": "2.7.1-beta.17", "fs-extra": "8.1.0", "i18next": "20.3.2", "json-stringify-safe": "5.0.1", @@ -31,5 +31,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-packages/package.json b/services/service-packages/package.json index b90b3b1021..0e9adc9873 100644 --- a/services/service-packages/package.json +++ b/services/service-packages/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-packages", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "scripts": {}, "license": "MIT", @@ -8,5 +8,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-pages/main/default/objects/pages/fields/is_active.field.yml b/services/service-pages/main/default/objects/pages/fields/is_active.field.yml index 2c95f180b3..2764ccf050 100644 --- a/services/service-pages/main/default/objects/pages/fields/is_active.field.yml +++ b/services/service-pages/main/default/objects/pages/fields/is_active.field.yml @@ -3,4 +3,5 @@ label: 状态 sort_no: 130 type: toggle defaultValue: true -visible_on: "{{'redash' != formData.render_engine ? true: false}}" \ No newline at end of file +visible_on: "{{'redash' != formData.render_engine ? true: false}}" +filterable: true \ No newline at end of file diff --git a/services/service-pages/main/default/objects/pages/fields/label.field.yml b/services/service-pages/main/default/objects/pages/fields/label.field.yml index 17e017b86b..0d43fd22ed 100644 --- a/services/service-pages/main/default/objects/pages/fields/label.field.yml +++ b/services/service-pages/main/default/objects/pages/fields/label.field.yml @@ -6,3 +6,4 @@ searchable: true sort_no: 120 is_name: true type: text +filterable: true diff --git a/services/service-pages/main/default/objects/pages/fields/name.field.yml b/services/service-pages/main/default/objects/pages/fields/name.field.yml index 839ee5cd5d..6253cdacf9 100644 --- a/services/service-pages/main/default/objects/pages/fields/name.field.yml +++ b/services/service-pages/main/default/objects/pages/fields/name.field.yml @@ -4,4 +4,5 @@ label: API Name required: true searchable: true sort_no: 100 -type: text \ No newline at end of file +type: text +filterable: true \ No newline at end of file diff --git a/services/service-pages/main/default/objects/pages/fields/type.field.yml b/services/service-pages/main/default/objects/pages/fields/type.field.yml index 70c2fa3643..e3dfdc940d 100644 --- a/services/service-pages/main/default/objects/pages/fields/type.field.yml +++ b/services/service-pages/main/default/objects/pages/fields/type.field.yml @@ -13,4 +13,5 @@ options: - label: 表单 value: form sort_no: 130 -visible_on: "{{'redash' != formData.render_engine ? true: false}}" \ No newline at end of file +visible_on: "{{'redash' != formData.render_engine ? true: false}}" +filterable: true \ No newline at end of file diff --git a/services/service-pages/main/default/objects/pages/listviews/all.listview.yml b/services/service-pages/main/default/objects/pages/listviews/all.listview.yml index 3d45a28ada..cfa373ad08 100644 --- a/services/service-pages/main/default/objects/pages/listviews/all.listview.yml +++ b/services/service-pages/main/default/objects/pages/listviews/all.listview.yml @@ -2,7 +2,6 @@ name: all columns: - field: label - field: name - - field: render_engine - field: type - field: object_name - field: is_active diff --git a/services/service-pages/main/default/objects/pages/listviews/customize.listview.yml b/services/service-pages/main/default/objects/pages/listviews/customize.listview.yml index a36af90e24..e7a840116a 100644 --- a/services/service-pages/main/default/objects/pages/listviews/customize.listview.yml +++ b/services/service-pages/main/default/objects/pages/listviews/customize.listview.yml @@ -2,7 +2,6 @@ name: customize columns: - field: label - field: name - - field: render_engine - field: type - field: object_name - field: is_active diff --git a/services/service-pages/main/default/objects/pages/listviews/recent.listview.yml b/services/service-pages/main/default/objects/pages/listviews/recent.listview.yml index db48821e39..31f37886f5 100644 --- a/services/service-pages/main/default/objects/pages/listviews/recent.listview.yml +++ b/services/service-pages/main/default/objects/pages/listviews/recent.listview.yml @@ -2,7 +2,6 @@ name: recent columns: - field: label - field: name - - field: render_engine - field: type - field: is_active - field: version diff --git a/services/service-pages/main/default/objects/pages/listviews/system.listview.yml b/services/service-pages/main/default/objects/pages/listviews/system.listview.yml index da8da5fa2e..733c518d00 100644 --- a/services/service-pages/main/default/objects/pages/listviews/system.listview.yml +++ b/services/service-pages/main/default/objects/pages/listviews/system.listview.yml @@ -2,7 +2,6 @@ name: system columns: - field: label - field: name - - field: render_engine - field: type - field: object_name - field: is_active diff --git a/services/service-pages/package.json b/services/service-pages/package.json index 176964b03e..496bb7b8ff 100644 --- a/services/service-pages/package.json +++ b/services/service-pages/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-pages", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": {}, "license": "MIT", @@ -8,7 +8,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { "clone": "^2.1.2", "ejs": "^3.1.8" diff --git a/services/service-plugin-amis/main/default/services/utils/page-schema.js b/services/service-plugin-amis/main/default/services/utils/page-schema.js index 64eb9d6c59..31bf4c8104 100644 --- a/services/service-plugin-amis/main/default/services/utils/page-schema.js +++ b/services/service-plugin-amis/main/default/services/utils/page-schema.js @@ -88,7 +88,7 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) { } const content = { "type": "tabs", - "className": "steedos-record-tabs bg-white p-4 m-2 border rounded", + "className": "steedos-record-tabs bg-white p-4 sm:m-2 sm:border sm:rounded", "tabs": [ detailed ] diff --git a/services/service-plugin-amis/package.json b/services/service-plugin-amis/package.json index 50bf27789c..88583ae59a 100644 --- a/services/service-plugin-amis/package.json +++ b/services/service-plugin-amis/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-plugin-amis", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": { "build": "yarn build:tailwind-base && yarn build:tailwind", @@ -13,7 +13,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "devDependencies": { "tailwindcss": "3.2.4" } diff --git a/services/service-plugin-amis/public/tailwind/tailwind-steedos.css b/services/service-plugin-amis/public/tailwind/tailwind-steedos.css index 729a9fd944..cf67cdea01 100644 --- a/services/service-plugin-amis/public/tailwind/tailwind-steedos.css +++ b/services/service-plugin-amis/public/tailwind/tailwind-steedos.css @@ -103,10 +103,6 @@ margin: auto } -.m-2 { - margin: 0.5rem -} - .mx-4 { margin-left: 1rem; margin-right: 1rem @@ -518,6 +514,10 @@ } @media (min-width: 640px) { + .sm\:m-2 { + margin: 0.5rem + } + .sm\:rounded-lg { border-radius: 0.5rem } diff --git a/services/service-push/package.json b/services/service-push/package.json index 095b5ec633..8d5c9de7fa 100644 --- a/services/service-push/package.json +++ b/services/service-push/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-push", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "A Steedos App", "main": "package.service.js", "license": "MIT", @@ -9,5 +9,5 @@ "access": "public" }, "scripts": {}, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-rest/package.json b/services/service-rest/package.json index 78669f2aa9..53378000f7 100644 --- a/services/service-rest/package.json +++ b/services/service-rest/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-rest", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -16,9 +16,9 @@ "repository": {}, "license": "MIT", "dependencies": { - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/service-object-mixin": "2.7.1-beta.16", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/service-object-mixin": "2.7.1-beta.17", "lodash": "^4.17.21" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-rest/package.service.js b/services/service-rest/package.service.js index 91bb545d93..9c89e4a746 100644 --- a/services/service-rest/package.service.js +++ b/services/service-rest/package.service.js @@ -2,7 +2,7 @@ * @Author: sunhaolin@hotoa.com * @Date: 2023-03-23 15:12:14 * @LastEditors: 孙浩林 sunhaolin@steedos.com - * @LastEditTime: 2024-05-15 13:46:12 + * @LastEditTime: 2024-05-21 13:22:25 * @Description: */ "use strict"; @@ -752,10 +752,15 @@ module.exports = { * } */ functions: { - rest: { - method: "POST", - path: "/:objectName/functions/:functionApiName", - }, + rest: [ + { + method: "GET", + path: "/:objectName/functions/:functionApiName", + }, { + method: "POST", + path: "/:objectName/functions/:functionApiName", + } + ], async handler(ctx) { const userSession = ctx.meta.user; const { objectName, functionApiName } = ctx.params; diff --git a/services/service-saas/package.json b/services/service-saas/package.json index 5203553d90..edd3d6af3c 100644 --- a/services/service-saas/package.json +++ b/services/service-saas/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-saas", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -12,5 +12,5 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-sentry/package.json b/services/service-sentry/package.json index 4322784e92..9f41fe5828 100644 --- a/services/service-sentry/package.json +++ b/services/service-sentry/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-sentry", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "license": "MIT", "dependencies": { @@ -12,5 +12,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-sidercar/package.json b/services/service-sidercar/package.json index 546b1d7bb8..d6092ee929 100644 --- a/services/service-sidercar/package.json +++ b/services/service-sidercar/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-sidecar", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "license": "MIT", "dependencies": { @@ -13,5 +13,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-steedos-server/package.json b/services/service-steedos-server/package.json index de5432438c..ecd2a15d7c 100644 --- a/services/service-steedos-server/package.json +++ b/services/service-steedos-server/package.json @@ -1,47 +1,47 @@ { "name": "@steedos/service-steedos-server", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "index.js", "license": "MIT", "dependencies": { - "@steedos/accounts": "2.7.1-beta.16", - "@steedos/core": "2.7.1-beta.16", - "@steedos/data-import": "2.7.1-beta.16", - "@steedos/metadata-api": "2.7.1-beta.16", - "@steedos/meteor-bundle-runner": "2.7.1-beta.16", - "@steedos/plugin-company": "2.7.1-beta.16", - "@steedos/service-accounts": "2.7.1-beta.16", - "@steedos/service-api": "2.7.1-beta.16", - "@steedos/service-cachers-manager": "2.7.1-beta.16", - "@steedos/service-charts": "2.7.1-beta.16", - "@steedos/service-fields-indexs": "2.7.1-beta.16", - "@steedos/service-files": "2.7.1-beta.16", - "@steedos/service-meteor-package-loader": "2.7.1-beta.16", - "@steedos/service-pages": "2.7.1-beta.16", - "@steedos/service-plugin-amis": "2.7.1-beta.16", - "@steedos/service-ui": "2.7.1-beta.16", - "@steedos/service-workflow": "2.7.1-beta.16", - "@steedos/standard-accounts": "2.7.1-beta.16", - "@steedos/standard-collaboration": "2.7.1-beta.16", - "@steedos/standard-object-database": "2.7.1-beta.16", - "@steedos/standard-permission": "2.7.1-beta.16", - "@steedos/standard-process": "2.7.1-beta.16", - "@steedos/standard-process-approval": "2.7.1-beta.16", - "@steedos/standard-space": "2.7.1-beta.16", - "@steedos/standard-ui": "2.7.1-beta.16", - "@steedos/unpkg": "2.7.1-beta.16", - "@steedos/webapp-accounts": "2.7.1-beta.16", - "@steedos/webapp-public": "2.7.1-beta.16", - "@steedos/workflow": "2.7.1-beta.16", + "@steedos/accounts": "2.7.1-beta.17", + "@steedos/core": "2.7.1-beta.17", + "@steedos/data-import": "2.7.1-beta.17", + "@steedos/metadata-api": "2.7.1-beta.17", + "@steedos/meteor-bundle-runner": "2.7.1-beta.17", + "@steedos/plugin-company": "2.7.1-beta.17", + "@steedos/service-accounts": "2.7.1-beta.17", + "@steedos/service-api": "2.7.1-beta.17", + "@steedos/service-cachers-manager": "2.7.1-beta.17", + "@steedos/service-charts": "2.7.1-beta.17", + "@steedos/service-fields-indexs": "2.7.1-beta.17", + "@steedos/service-files": "2.7.1-beta.17", + "@steedos/service-meteor-package-loader": "2.7.1-beta.17", + "@steedos/service-pages": "2.7.1-beta.17", + "@steedos/service-plugin-amis": "2.7.1-beta.17", + "@steedos/service-ui": "2.7.1-beta.17", + "@steedos/service-workflow": "2.7.1-beta.17", + "@steedos/standard-accounts": "2.7.1-beta.17", + "@steedos/standard-collaboration": "2.7.1-beta.17", + "@steedos/standard-object-database": "2.7.1-beta.17", + "@steedos/standard-permission": "2.7.1-beta.17", + "@steedos/standard-process": "2.7.1-beta.17", + "@steedos/standard-process-approval": "2.7.1-beta.17", + "@steedos/standard-space": "2.7.1-beta.17", + "@steedos/standard-ui": "2.7.1-beta.17", + "@steedos/unpkg": "2.7.1-beta.17", + "@steedos/webapp-accounts": "2.7.1-beta.17", + "@steedos/webapp-public": "2.7.1-beta.17", + "@steedos/workflow": "2.7.1-beta.17", "dotenv-flow": "^3.2.0", "moleculer": "^0.14.25", "moleculer-db": "^0.8.4", "moleculer-web": "^0.10.4", - "steedos-server": "2.7.1-beta.16" + "steedos-server": "2.7.1-beta.17" }, "private": false, "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-ui/package.json b/services/service-ui/package.json index bd8e812dab..bf8f150851 100644 --- a/services/service-ui/package.json +++ b/services/service-ui/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-ui", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "keywords": [ "steedos" @@ -11,9 +11,9 @@ "description": "steedos package", "repository": {}, "dependencies": { - "@steedos/core": "2.7.1-beta.16", - "@steedos/i18n": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/core": "2.7.1-beta.17", + "@steedos/i18n": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", "express": "4.18.1" }, "license": "MIT", @@ -21,5 +21,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-workflow/package.json b/services/service-workflow/package.json index 8ac01b3d98..703e0e771c 100644 --- a/services/service-workflow/package.json +++ b/services/service-workflow/package.json @@ -1,11 +1,11 @@ { "name": "@steedos/service-workflow", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "license": "MIT", "dependencies": { - "@steedos/service-object-graphql": "2.7.1-beta.16", - "@steedos/workflow": "2.7.1-beta.16", + "@steedos/service-object-graphql": "2.7.1-beta.17", + "@steedos/workflow": "2.7.1-beta.17", "he": "1.2.0", "lodash": "^4.17.21", "node-schedule": "^2.0.0" @@ -14,5 +14,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/service-workflow/public/workflow/index.css b/services/service-workflow/public/workflow/index.css index 4b24e01714..25a7dd6944 100644 --- a/services/service-workflow/public/workflow/index.css +++ b/services/service-workflow/public/workflow/index.css @@ -321,4 +321,9 @@ tbody .color-priority-muted *{ .instance-wrapper .instance_attachments .steedos-amis-button-instance-preview li.steedos-amis-button{ width: -webkit-fill-available; } +} + +/* amis 弹出窗口,包括弹出drawer中的审批单详细界面不显示左上角返回按钮 */ +.amis-dialog-widget .instance-detail-service-wrapper .btn-instance-back{ + display: none; } \ No newline at end of file diff --git a/services/standard-accounts/package.json b/services/standard-accounts/package.json index 3ff6900983..f910e6609e 100644 --- a/services/standard-accounts/package.json +++ b/services/standard-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-accounts", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -12,5 +12,5 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/standard-cms/package.json b/services/standard-cms/package.json index 01597690ce..db02638e1b 100644 --- a/services/standard-cms/package.json +++ b/services/standard-cms/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-cms", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -12,5 +12,5 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/standard-collaboration/package.json b/services/standard-collaboration/package.json index 60e4668064..b7fbac1ac5 100644 --- a/services/standard-collaboration/package.json +++ b/services/standard-collaboration/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-collaboration", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -12,7 +12,7 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { "clone": "^2.1.2" } diff --git a/services/standard-object-database/main/default/objectTranslations/object_functions.en/object_functions.en.objectTranslation.yml b/services/standard-object-database/main/default/objectTranslations/object_functions.en/object_functions.en.objectTranslation.yml index 2608d365c9..7a704b7db7 100644 --- a/services/standard-object-database/main/default/objectTranslations/object_functions.en/object_functions.en.objectTranslation.yml +++ b/services/standard-object-database/main/default/objectTranslations/object_functions.en/object_functions.en.objectTranslation.yml @@ -49,6 +49,10 @@ fields: options: - label: "Script" value: "script" + description: + label: Description + help: + description: listviews: all: label: All diff --git a/services/standard-object-database/main/default/objectTranslations/object_functions.zh-CN/object_functions.zh-CN.objectTranslation.yml b/services/standard-object-database/main/default/objectTranslations/object_functions.zh-CN/object_functions.zh-CN.objectTranslation.yml index fb658c1fdc..67b481d76b 100644 --- a/services/standard-object-database/main/default/objectTranslations/object_functions.zh-CN/object_functions.zh-CN.objectTranslation.yml +++ b/services/standard-object-database/main/default/objectTranslations/object_functions.zh-CN/object_functions.zh-CN.objectTranslation.yml @@ -46,6 +46,10 @@ fields: options: - label: "Script" value: "script" + description: + label: 备注 + help: + description: listviews: all: label: 所有 diff --git a/services/standard-object-database/main/default/objects/datasources/fields/driver.field.yml b/services/standard-object-database/main/default/objects/datasources/fields/driver.field.yml index 0c9e7af49e..c87a2ea6d4 100644 --- a/services/standard-object-database/main/default/objects/datasources/fields/driver.field.yml +++ b/services/standard-object-database/main/default/objects/datasources/fields/driver.field.yml @@ -6,3 +6,4 @@ options: >- Server:sqlserver,PostgreSQL:postgres,Oracle:oracle,MySQL:mysql,Sqlite:sqlite required: true sort_no: 100 +filterable: true diff --git a/services/standard-object-database/main/default/objects/datasources/fields/is_enable.field.yml b/services/standard-object-database/main/default/objects/datasources/fields/is_enable.field.yml index 4dd687ff91..4374988e1f 100644 --- a/services/standard-object-database/main/default/objects/datasources/fields/is_enable.field.yml +++ b/services/standard-object-database/main/default/objects/datasources/fields/is_enable.field.yml @@ -2,3 +2,4 @@ name: is_enable type: boolean label: Enable sort_no: 250 +filterable: true diff --git a/services/standard-object-database/main/default/objects/datasources/fields/label.field.yml b/services/standard-object-database/main/default/objects/datasources/fields/label.field.yml index 02830ddee7..f20327a942 100644 --- a/services/standard-object-database/main/default/objects/datasources/fields/label.field.yml +++ b/services/standard-object-database/main/default/objects/datasources/fields/label.field.yml @@ -4,3 +4,5 @@ label: Label required: true is_name: true sort_no: 110 +filterable: true +searchable: true diff --git a/services/standard-object-database/main/default/objects/datasources/fields/name.field.yml b/services/standard-object-database/main/default/objects/datasources/fields/name.field.yml index 49b6036b38..08c273e986 100644 --- a/services/standard-object-database/main/default/objects/datasources/fields/name.field.yml +++ b/services/standard-object-database/main/default/objects/datasources/fields/name.field.yml @@ -9,3 +9,4 @@ inlineHelpText: >- cannot end with an underscore character or contain two consecutive underscore characters sort_no: 120 +filterable: true diff --git a/services/standard-object-database/main/default/objects/object_fields/fields/is_name.field.yml b/services/standard-object-database/main/default/objects/object_fields/fields/is_name.field.yml index 375dd7d128..ee9e84d98b 100644 --- a/services/standard-object-database/main/default/objects/object_fields/fields/is_name.field.yml +++ b/services/standard-object-database/main/default/objects/object_fields/fields/is_name.field.yml @@ -6,4 +6,4 @@ hidden: false label: Is Name sort_no: 650 type: boolean -visible_on: ${ARRAYSOME(['text', 'textarea', 'autonumber', 'date', 'datetime', 'time', 'formula', 'lookup'], item => item === type) && !multiple} +visible_on: ${ARRAYSOME(['text', 'textarea', 'autonumber', 'date', 'datetime', 'time', 'formula', 'lookup', 'master_detail'], item => item === type) && !multiple} diff --git a/services/standard-object-database/main/default/objects/object_fields/fields/summary_filters.field.yml b/services/standard-object-database/main/default/objects/object_fields/fields/summary_filters.field.yml index 35d34d6134..b25c0172c5 100644 --- a/services/standard-object-database/main/default/objects/object_fields/fields/summary_filters.field.yml +++ b/services/standard-object-database/main/default/objects/object_fields/fields/summary_filters.field.yml @@ -13,4 +13,4 @@ is_wide: true label: Filter Criteria sort_no: 280 type: table -visible_on: '{{formData.type === ''summary'' && global.mode !=''read'' ? true: false}}' +visible_on: '{{formData.type === ''summary''}}' diff --git a/services/standard-object-database/main/default/objects/object_functions/fields/description.field.yml b/services/standard-object-database/main/default/objects/object_functions/fields/description.field.yml new file mode 100644 index 0000000000..da6992c8c4 --- /dev/null +++ b/services/standard-object-database/main/default/objects/object_functions/fields/description.field.yml @@ -0,0 +1,5 @@ +name: description +label: Description +type: textarea +sort_no: 200 +is_wide: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/object_functions/fields/script.field.yml b/services/standard-object-database/main/default/objects/object_functions/fields/script.field.yml index e2ae43ccf7..af23fd0038 100644 --- a/services/standard-object-database/main/default/objects/object_functions/fields/script.field.yml +++ b/services/standard-object-database/main/default/objects/object_functions/fields/script.field.yml @@ -9,13 +9,13 @@ defaultValue: |- // objects // ctx.input editorDidMount: >- - if(window._registerCompletionItemProviderTrigger){ + if(window._registerCompletionItemProviderFunction){ return ; } - window._registerCompletionItemProviderTrigger = true; + window._registerCompletionItemProviderFunction = true; - const result = Steedos.authRequest("/service/api/suggestions/trigger.d.ts", + const result = Steedos.authRequest("/service/api/suggestions/function.d.ts", {async: false}); monaco.languages.typescript.javascriptDefaults.addExtraLib( diff --git a/services/standard-object-database/main/default/objects/object_triggers/fields/_name.field.yml b/services/standard-object-database/main/default/objects/object_triggers/fields/_name.field.yml index 3733aebf56..8cfe4575ef 100644 --- a/services/standard-object-database/main/default/objects/object_triggers/fields/_name.field.yml +++ b/services/standard-object-database/main/default/objects/object_triggers/fields/_name.field.yml @@ -5,3 +5,4 @@ searchable: true index: true required: true sort_no: 100 +filterable: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/object_triggers/fields/isEnabled.field.yml b/services/standard-object-database/main/default/objects/object_triggers/fields/isEnabled.field.yml index 159dfb68e1..573ad24812 100644 --- a/services/standard-object-database/main/default/objects/object_triggers/fields/isEnabled.field.yml +++ b/services/standard-object-database/main/default/objects/object_triggers/fields/isEnabled.field.yml @@ -3,3 +3,4 @@ label: Enabled type: boolean defaultValue: true sort_no: 140 +filterable: true diff --git a/services/standard-object-database/main/default/objects/object_triggers/fields/listenTo.field.yml b/services/standard-object-database/main/default/objects/object_triggers/fields/listenTo.field.yml index b8e7456df5..0144044074 100644 --- a/services/standard-object-database/main/default/objects/object_triggers/fields/listenTo.field.yml +++ b/services/standard-object-database/main/default/objects/object_triggers/fields/listenTo.field.yml @@ -5,3 +5,4 @@ reference_to: objects reference_to_field: name required: true sort_no: 120 +filterable: true diff --git a/services/standard-object-database/main/default/objects/object_triggers/fields/name.field.yml b/services/standard-object-database/main/default/objects/object_triggers/fields/name.field.yml index b1024f68b4..39a145ca1f 100644 --- a/services/standard-object-database/main/default/objects/object_triggers/fields/name.field.yml +++ b/services/standard-object-database/main/default/objects/object_triggers/fields/name.field.yml @@ -3,3 +3,4 @@ data_type: text type: text visible_on: '{{false}}' sort_no: 110 +filterable: true diff --git a/services/standard-object-database/main/default/objects/object_triggers/fields/when.field.yml b/services/standard-object-database/main/default/objects/object_triggers/fields/when.field.yml index 3641e2718b..140efd9fbc 100644 --- a/services/standard-object-database/main/default/objects/object_triggers/fields/when.field.yml +++ b/services/standard-object-database/main/default/objects/object_triggers/fields/when.field.yml @@ -20,3 +20,4 @@ options: - label: 查询记录之前 value: beforeFind sort_no: 130 +filterable: true diff --git a/services/standard-object-database/main/default/objects/object_validation_rules/fields/active.field.yml b/services/standard-object-database/main/default/objects/object_validation_rules/fields/active.field.yml index e374bd9380..f469a4c590 100644 --- a/services/standard-object-database/main/default/objects/object_validation_rules/fields/active.field.yml +++ b/services/standard-object-database/main/default/objects/object_validation_rules/fields/active.field.yml @@ -5,3 +5,4 @@ inlineHelpText: >- Indicates whether this validation rule is active, (true), or not active (false). sort_no: 120 +filterable: true diff --git a/services/standard-object-database/main/default/objects/object_validation_rules/fields/description.field.yml b/services/standard-object-database/main/default/objects/object_validation_rules/fields/description.field.yml index 7e2e378bf9..4de29c03a8 100644 --- a/services/standard-object-database/main/default/objects/object_validation_rules/fields/description.field.yml +++ b/services/standard-object-database/main/default/objects/object_validation_rules/fields/description.field.yml @@ -3,3 +3,4 @@ type: textarea is_wide: true label: description sort_no: 130 +filterable: true diff --git a/services/standard-object-database/main/default/objects/object_validation_rules/fields/name.field.yml b/services/standard-object-database/main/default/objects/object_validation_rules/fields/name.field.yml index 93c271b53f..16aab72ddc 100644 --- a/services/standard-object-database/main/default/objects/object_validation_rules/fields/name.field.yml +++ b/services/standard-object-database/main/default/objects/object_validation_rules/fields/name.field.yml @@ -3,3 +3,5 @@ type: text label: Name required: true sort_no: 100 +filterable: true +searchable: true diff --git a/services/standard-object-database/main/default/objects/object_validation_rules/fields/object_name.field.yml b/services/standard-object-database/main/default/objects/object_validation_rules/fields/object_name.field.yml index 5582239000..154df55024 100644 --- a/services/standard-object-database/main/default/objects/object_validation_rules/fields/object_name.field.yml +++ b/services/standard-object-database/main/default/objects/object_validation_rules/fields/object_name.field.yml @@ -6,3 +6,4 @@ write_requires_master_read: true reference_to_field: name required: true sort_no: 110 +filterable: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/object_webhooks/fields/event.field.yml b/services/standard-object-database/main/default/objects/object_webhooks/fields/event.field.yml index 9d7f35d956..c6d5fad98b 100644 --- a/services/standard-object-database/main/default/objects/object_webhooks/fields/event.field.yml +++ b/services/standard-object-database/main/default/objects/object_webhooks/fields/event.field.yml @@ -12,4 +12,5 @@ options: - label: 记录已创建或已更新 value: createAndUpdate - label: 记录已删除 - value: delete \ No newline at end of file + value: delete +filterable: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/object_webhooks/fields/execute_when.field.yml b/services/standard-object-database/main/default/objects/object_webhooks/fields/execute_when.field.yml index cd60897eba..537e1e64e6 100644 --- a/services/standard-object-database/main/default/objects/object_webhooks/fields/execute_when.field.yml +++ b/services/standard-object-database/main/default/objects/object_webhooks/fields/execute_when.field.yml @@ -9,4 +9,5 @@ options: - label: 每次更新记录并满足条件要求 value: trueEveryTime - label: 仅在更新记录以满足条件要求时 - value: trueOnChangeOnly \ No newline at end of file + value: trueOnChangeOnly +filterable: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/object_webhooks/fields/name.field.yml b/services/standard-object-database/main/default/objects/object_webhooks/fields/name.field.yml index 24c0c9b0b7..d0d8cf080b 100644 --- a/services/standard-object-database/main/default/objects/object_webhooks/fields/name.field.yml +++ b/services/standard-object-database/main/default/objects/object_webhooks/fields/name.field.yml @@ -2,4 +2,6 @@ name: name type: text label: Name required: true -sort_no: 10 \ No newline at end of file +sort_no: 10 +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/object_webhooks/fields/object_name.field.yml b/services/standard-object-database/main/default/objects/object_webhooks/fields/object_name.field.yml index 27c2465213..d4ef878a74 100644 --- a/services/standard-object-database/main/default/objects/object_webhooks/fields/object_name.field.yml +++ b/services/standard-object-database/main/default/objects/object_webhooks/fields/object_name.field.yml @@ -5,4 +5,6 @@ reference_to_field: name label: Object required: true index: true -sort_no: 20 \ No newline at end of file +sort_no: 20 +searchable: true +filterable: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/object_webhooks/fields/payload_url.field.yml b/services/standard-object-database/main/default/objects/object_webhooks/fields/payload_url.field.yml index 0155465c7a..c413d97c74 100644 --- a/services/standard-object-database/main/default/objects/object_webhooks/fields/payload_url.field.yml +++ b/services/standard-object-database/main/default/objects/object_webhooks/fields/payload_url.field.yml @@ -4,4 +4,6 @@ type: text is_wide: true # regEx: /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/i required: true -sort_no: 70 \ No newline at end of file +sort_no: 70 +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-object-database/main/default/objects/objects/fields/description.field.yml b/services/standard-object-database/main/default/objects/objects/fields/description.field.yml index 6351aec213..28c62b0997 100644 --- a/services/standard-object-database/main/default/objects/objects/fields/description.field.yml +++ b/services/standard-object-database/main/default/objects/objects/fields/description.field.yml @@ -4,3 +4,4 @@ is_wide: true label: Description sort_no: 50 type: textarea +filterable: true diff --git a/services/standard-object-database/main/default/objects/objects/fields/in_development.field.yml b/services/standard-object-database/main/default/objects/objects/fields/in_development.field.yml index 988d96c8d7..5ef8a55cde 100644 --- a/services/standard-object-database/main/default/objects/objects/fields/in_development.field.yml +++ b/services/standard-object-database/main/default/objects/objects/fields/in_development.field.yml @@ -13,3 +13,5 @@ options: required: true sort_no: 40 type: select +filterable: true + diff --git a/services/standard-object-database/main/default/objects/objects/fields/is_customize.field.yml b/services/standard-object-database/main/default/objects/objects/fields/is_customize.field.yml index 30e38b5d13..492b5e1ceb 100644 --- a/services/standard-object-database/main/default/objects/objects/fields/is_customize.field.yml +++ b/services/standard-object-database/main/default/objects/objects/fields/is_customize.field.yml @@ -4,3 +4,4 @@ label: 是否自定义 readonly: true sort_no: 100 type: boolean +filterable: true diff --git a/services/standard-object-database/main/default/objects/objects/fields/is_system.field.yml b/services/standard-object-database/main/default/objects/objects/fields/is_system.field.yml index 419e5c4bbe..9ccdffd140 100644 --- a/services/standard-object-database/main/default/objects/objects/fields/is_system.field.yml +++ b/services/standard-object-database/main/default/objects/objects/fields/is_system.field.yml @@ -6,3 +6,4 @@ readonly: true sort_no: 110 type: boolean visible_on: '{{global.mode ===''read'' ? true : false}}' +filterable: true diff --git a/services/standard-object-database/main/default/server/object_fields.object.js b/services/standard-object-database/main/default/server/object_fields.object.js index c17014f551..8db73d5df1 100644 --- a/services/standard-object-database/main/default/server/object_fields.object.js +++ b/services/standard-object-database/main/default/server/object_fields.object.js @@ -299,7 +299,7 @@ function allowChangeObject(){ } function checkNameField(nameField){ - if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula", "lookup"].indexOf(nameField.type) < 0){ + if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula", "lookup", "master_detail"].indexOf(nameField.type) < 0){ throw new Error("只有文本、长文本、自动编号、日期、日期时间、时间、公式、相关表这些类型的字段可以被设置为名称字段"); } else if(nameField.type == "lookup" && nameField.multiple) { throw new Error("多选的相关表字段不可以被设置为名称字段"); diff --git a/services/standard-object-database/main/default/services/suggestions.service.js b/services/standard-object-database/main/default/services/suggestions.service.js index 9290f1e650..c5ca0a3d81 100644 --- a/services/standard-object-database/main/default/services/suggestions.service.js +++ b/services/standard-object-database/main/default/services/suggestions.service.js @@ -129,6 +129,98 @@ module.exports = { ${servicesTypes} ` } + }, + functionTSExtraLib: { + rest: { + method: "GET", + path: "/function.d.ts", + }, + async handler(ctx) { + let objectsTypes = 'declare const objects: {'; + _.each(global.objects, (v, k)=>{ + objectsTypes = `${objectsTypes} ${k}: SteedosObjectType;` + }); + + objectsTypes = objectsTypes + '}' + + return ` + + declare var global = {_: any, moment: any, validator: any, filters: any}; + + declare type Params = { + userId: SteedosIDType; + spaceId?: SteedosIDType; + } + + declare type CTXType = { + input: any; + params: Params; + broker: { + meta: any; + call: any; + mcall: any; + emit: any; + broadcast: any; + broadcastLocal: any; + namespace: string; + nodeID: string; + instanceID: string; + logger: any; + metadata: any; + }, + getObject(objectName: string): SteedosObjectType; + getUser(userId: string, spaceId: string): Promise; + }; + + declare var ctx: CTXType; + + declare type SteedosQueryFilters = any; + declare type SteedosIDType = number | string; + declare type SteedosQueryOptions = { + fields?: Array | string; + readonly filters?: SteedosQueryFilters; + readonly top?: number; + readonly skip?: number; + readonly sort?: string; + }; + declare type SteedosUserSession = { + userId: SteedosIDType; + spaceId?: string; + name: string; + username?: string; + mobile?: string; + email?: string; + utcOffset?: number; + locale?: string; + roles?: string[]; + space?: any; + spaces?: any; + company?: any; + companies?: any; + organization?: any; + organizations?: any; + permission_shares?: any; + company_id?: string; + company_ids?: string[]; + is_space_admin?: boolean; + steedos_id?: string; + }; + declare class SteedosObjectType { + find(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise; + findOne(id: SteedosIDType, query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise; + insert(doc: Dictionary, userSession?: SteedosUserSession): Promise; + update(id: SteedosIDType, doc: Dictionary, userSession?: SteedosUserSession): Promise; + delete(id: SteedosIDType, userSession?: SteedosUserSession): Promise; + directFind(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise; + directInsert(doc: Dictionary, userSession?: SteedosUserSession): Promise; + directUpdate(id: SteedosIDType, doc: Dictionary, userSession?: SteedosUserSession): Promise; + directDelete(id: SteedosIDType, userSession?: SteedosUserSession): Promise; + count(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise; + _makeNewID(): Promise; + } + ${objectsTypes} + ` + } } }, diff --git a/services/standard-object-database/package.json b/services/standard-object-database/package.json index ead7fb008b..307aecd3f0 100644 --- a/services/standard-object-database/package.json +++ b/services/standard-object-database/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-object-database", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -12,14 +12,14 @@ "description": "steedos package", "dependencies": { "@steedos-widgets/amis-lib": "^1.0.22", - "@steedos/metadata-core": "2.7.1-beta.16", - "@steedos/service-object-mixin": "2.7.1-beta.16", - "@steedos/standard-objects": "2.7.1-beta.16", + "@steedos/metadata-core": "2.7.1-beta.17", + "@steedos/service-object-mixin": "2.7.1-beta.17", + "@steedos/standard-objects": "2.7.1-beta.17", "amis-formula": "~6.3.0", "clone": "^2.1.2", "moleculer-bullmq": "3.0.0" }, "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/standard-permission/main/default/objects/permission_set/permission_set.object.yml b/services/standard-permission/main/default/objects/permission_set/permission_set.object.yml index b20e044e45..aada19dbe8 100644 --- a/services/standard-permission/main/default/objects/permission_set/permission_set.object.yml +++ b/services/standard-permission/main/default/objects/permission_set/permission_set.object.yml @@ -21,10 +21,12 @@ fields: index: true is_name: true required: true + filterable: true type: label: Type type: select firstOption: false + filterable: true options: Profile:profile,Permission set:permission_set defaultValue: permission_set amis: @@ -36,7 +38,7 @@ fields: reference_to: apps reference_to_field: code name: assigned_apps - filterable: true + filterable: false default_standard_buttons: label: Default Standard Buttons type: select diff --git a/services/standard-permission/package.json b/services/standard-permission/package.json index 4139196cf8..c57a7ca6cf 100644 --- a/services/standard-permission/package.json +++ b/services/standard-permission/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-permission", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -12,7 +12,7 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { "clone": "^2.1.2" } diff --git a/services/standard-process-approval/main/default/objects/process/approval/process_definition.object.yml b/services/standard-process-approval/main/default/objects/process/approval/process_definition.object.yml index 873ec1cc98..cc1a79dd73 100644 --- a/services/standard-process-approval/main/default/objects/process/approval/process_definition.object.yml +++ b/services/standard-process-approval/main/default/objects/process/approval/process_definition.object.yml @@ -8,10 +8,14 @@ fields: name: type: text required: true + filterable: true + searchable: true label: type: text required: true is_name: true + filterable: true + searchable: true object_name: type: lookup required: true @@ -24,6 +28,8 @@ fields: label: Description type: textarea is_wide: true + filterable: true + searchable: true order: #TODO 必须是连续的数字 type: number required: true @@ -36,6 +42,7 @@ fields: # omit: true readonly: true defaultValue: false + filterable: true visible_on: "{{global.mode ==='read' ? true : false}}" entry_criteria: type: textarea @@ -91,6 +98,7 @@ fields: type: boolean is_wide: true label: Allow submitters to recall approval requests + filterable: true # group: 提交设置 initial_submission_record_lock: type: select diff --git a/services/standard-process-approval/main/default/objects/process/approval/process_node.object.yml b/services/standard-process-approval/main/default/objects/process/approval/process_node.object.yml index 1953d47db4..ad7fbd2114 100644 --- a/services/standard-process-approval/main/default/objects/process/approval/process_node.object.yml +++ b/services/standard-process-approval/main/default/objects/process/approval/process_node.object.yml @@ -99,7 +99,7 @@ fields: } var object_name = Creator.odata.get("process_definition", pid, "object_name").object_name; var userFields = _.filter(Creator.getObject(object_name).fields, function(field){ - return (field.type === 'lookup' || field.type === 'master_detail') && field.omit != true && field.reference_to === 'users' + return (field.type === 'lookup' || field.type === 'master_detail') && field.omit != true && (field.reference_to === 'users' || (field.reference_to === 'space_users' && field.reference_to_field === 'user')) }); _.each(userFields, function(field){ options.push({label:field.label, value:field.name}); diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/action_field_updates.object.yml b/services/standard-process-approval/main/default/objects/workflow-actions/action_field_updates.object.yml index 87c750c659..e71722ce93 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/action_field_updates.object.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/action_field_updates.object.yml @@ -9,16 +9,21 @@ fields: name: type: text required: true + filterable: true + searchable: true label: type: text required: true is_name: true + filterable: true + searchable: true object_name: label: Object Name type: lookup reference_to: objects reference_to_field: name required: true + filterable: true target_object: required: true type: lookup @@ -80,6 +85,7 @@ fields: label: Description type: textarea is_wide: true + filterable: true reevaluate_on_change: type: boolean label: Re-evaluate Workflow Rules after Field Change diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_notifications.object.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_notifications.object.yml index 5b78991298..eb1264dabd 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_notifications.object.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_notifications.object.yml @@ -11,11 +11,14 @@ fields: searchable: true index: true required: true + filterable: true inlineHelpText: Can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore character or contain two consecutive underscore characters label: type: text required: true is_name: true + filterable: true + searchable: true object_name: label: Object Name type: lookup @@ -23,6 +26,7 @@ fields: is_wide: true reference_to: objects reference_to_field: name + filterable: true title: label: Title type: textarea diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/description.field.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/description.field.yml index d43767ebe8..ce6e63a1d7 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/description.field.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/description.field.yml @@ -2,4 +2,5 @@ name: description label: 描述 type: textarea sort_no: 40 -is_wide: true \ No newline at end of file +is_wide: true +filterable: true \ No newline at end of file diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/endpoint_url.field.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/endpoint_url.field.yml index a79f1647ef..45c5a1f4d9 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/endpoint_url.field.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/endpoint_url.field.yml @@ -3,4 +3,6 @@ label: 端点 URL type: url required: true sort_no: 50 -is_wide: true \ No newline at end of file +is_wide: true +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/label.field.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/label.field.yml index dc6175d076..7dfe8c70eb 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/label.field.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/label.field.yml @@ -5,4 +5,5 @@ required: true searchable: true index: true is_name: true -sort_no: 20 \ No newline at end of file +sort_no: 20 +filterable: true \ No newline at end of file diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/name.field.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/name.field.yml index 2bacc862da..d5bd2c0d7c 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/name.field.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/name.field.yml @@ -4,4 +4,5 @@ type: text required: true searchable: true index: true -sort_no: 30 \ No newline at end of file +sort_no: 30 +filterable: true \ No newline at end of file diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/object_name.field.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/object_name.field.yml index 9137d60444..eedb5b13aa 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/object_name.field.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/fields/object_name.field.yml @@ -6,4 +6,5 @@ is_wide: true reference_to: objects reference_to_field: name index: true -sort_no: 10 \ No newline at end of file +sort_no: 10 +filterable: true \ No newline at end of file diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/listviews/all.listview.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/listviews/all.listview.yml index 7db4e6be79..54eb0ef977 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/listviews/all.listview.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_outbound_messages/listviews/all.listview.yml @@ -1,8 +1,8 @@ name: all columns: - - field: object_name - field: label - field: name + - field: object_name - field: description - field: endpoint_url - field: modified diff --git a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_rule.object.yml b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_rule.object.yml index 7e63c92c7b..1df442eb29 100644 --- a/services/standard-process-approval/main/default/objects/workflow-actions/workflow_rule.object.yml +++ b/services/standard-process-approval/main/default/objects/workflow-actions/workflow_rule.object.yml @@ -12,15 +12,21 @@ fields: is_wide: true reference_to: objects reference_to_field: name + filterable: true name: type: text required: true + filterable: true + searchable: true label: type: text required: true is_name: true + filterable: true + searchable: true active: type: boolean + filterable: true # hidden: true trigger_type: type: select @@ -32,6 +38,7 @@ fields: - onAllChanges - onCreateOrTriggeringUpdate defaultValue: onCreateOrTriggeringUpdate + filterable: true formula: type: textarea is_wide: true diff --git a/services/standard-process-approval/package.json b/services/standard-process-approval/package.json index 6d8ca10606..ba47cc4218 100644 --- a/services/standard-process-approval/package.json +++ b/services/standard-process-approval/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-process-approval", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -10,10 +10,10 @@ "steedos" ], "dependencies": { - "@steedos/process": "2.7.1-beta.16" + "@steedos/process": "2.7.1-beta.17" }, "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/standard-space/main/default/objects/company/fields/admins.field.yml b/services/standard-space/main/default/objects/company/fields/admins.field.yml index e929cd73e7..1b47e18fea 100644 --- a/services/standard-space/main/default/objects/company/fields/admins.field.yml +++ b/services/standard-space/main/default/objects/company/fields/admins.field.yml @@ -3,5 +3,5 @@ label: Admin Users type: lookup reference_to: users multiple: true -filterable: true +filterable: false sort_no: 150 diff --git a/services/standard-space/main/default/objects/company/fields/code.field.yml b/services/standard-space/main/default/objects/company/fields/code.field.yml index 34fac760ae..f2642a101f 100644 --- a/services/standard-space/main/default/objects/company/fields/code.field.yml +++ b/services/standard-space/main/default/objects/company/fields/code.field.yml @@ -2,3 +2,5 @@ name: code label: Code type: text sort_no: 110 +filterable: true +searchable: true diff --git a/services/standard-space/main/default/objects/company/fields/name.field.yml b/services/standard-space/main/default/objects/company/fields/name.field.yml index 137c799ac9..b0fe8d13cf 100644 --- a/services/standard-space/main/default/objects/company/fields/name.field.yml +++ b/services/standard-space/main/default/objects/company/fields/name.field.yml @@ -3,3 +3,5 @@ label: Name type: text required: true sort_no: 100 +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/company/fields/organization.field.yml b/services/standard-space/main/default/objects/company/fields/organization.field.yml index d9c15867ed..cc91ce7ae2 100644 --- a/services/standard-space/main/default/objects/company/fields/organization.field.yml +++ b/services/standard-space/main/default/objects/company/fields/organization.field.yml @@ -5,3 +5,4 @@ required: true reference_to: organizations omit: false sort_no: 130 +filterable: true diff --git a/services/standard-space/main/default/objects/logs/fields/level.field.yml b/services/standard-space/main/default/objects/logs/fields/level.field.yml index a50f6a74a8..fa86b223d8 100644 --- a/services/standard-space/main/default/objects/logs/fields/level.field.yml +++ b/services/standard-space/main/default/objects/logs/fields/level.field.yml @@ -1,3 +1,5 @@ name: level type: text -sort_no: 120 \ No newline at end of file +sort_no: 120 +searchable: true +filterable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/logs/fields/name.field.yml b/services/standard-space/main/default/objects/logs/fields/name.field.yml index 9d3cbd1923..159264895c 100644 --- a/services/standard-space/main/default/objects/logs/fields/name.field.yml +++ b/services/standard-space/main/default/objects/logs/fields/name.field.yml @@ -1,3 +1,5 @@ name: name type: text -sort_no: 100 \ No newline at end of file +sort_no: 100 +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/fields/name.field.yml b/services/standard-space/main/default/objects/operation_logs/fields/name.field.yml index 2734e0da9c..b0ba3f03bb 100644 --- a/services/standard-space/main/default/objects/operation_logs/fields/name.field.yml +++ b/services/standard-space/main/default/objects/operation_logs/fields/name.field.yml @@ -1,4 +1,6 @@ name: name type: text label: 名称 -sort_no: 10 \ No newline at end of file +sort_no: 10 +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/fields/object.field.yml b/services/standard-space/main/default/objects/operation_logs/fields/object.field.yml index 89722f969c..133dc16ec6 100644 --- a/services/standard-space/main/default/objects/operation_logs/fields/object.field.yml +++ b/services/standard-space/main/default/objects/operation_logs/fields/object.field.yml @@ -1,3 +1,5 @@ name: object type: text -label: 对象 \ No newline at end of file +label: 对象 +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/fields/related_to.field.yml b/services/standard-space/main/default/objects/operation_logs/fields/related_to.field.yml index b2b6303c32..29f2692cc4 100644 --- a/services/standard-space/main/default/objects/operation_logs/fields/related_to.field.yml +++ b/services/standard-space/main/default/objects/operation_logs/fields/related_to.field.yml @@ -17,4 +17,5 @@ reference_to: ! |- return [] } } -name: related_to \ No newline at end of file +name: related_to +filterable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/fields/remote_user.field.yml b/services/standard-space/main/default/objects/operation_logs/fields/remote_user.field.yml index bf0919ecbf..0518e92ada 100644 --- a/services/standard-space/main/default/objects/operation_logs/fields/remote_user.field.yml +++ b/services/standard-space/main/default/objects/operation_logs/fields/remote_user.field.yml @@ -2,4 +2,5 @@ name: remote_user type: lookup reference_to: users label: 操作人 -sort_no: 22 \ No newline at end of file +sort_no: 22 +filterable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/fields/status.field.yml b/services/standard-space/main/default/objects/operation_logs/fields/status.field.yml index c1ebbe033a..d9f1c8deaa 100644 --- a/services/standard-space/main/default/objects/operation_logs/fields/status.field.yml +++ b/services/standard-space/main/default/objects/operation_logs/fields/status.field.yml @@ -8,4 +8,5 @@ options: color: 008000 - label: 失败 value: fail - color: ff0000 \ No newline at end of file + color: ff0000 +filterable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/fields/type.field.yml b/services/standard-space/main/default/objects/operation_logs/fields/type.field.yml index 79abcbb1ae..7cd0961658 100644 --- a/services/standard-space/main/default/objects/operation_logs/fields/type.field.yml +++ b/services/standard-space/main/default/objects/operation_logs/fields/type.field.yml @@ -1,4 +1,6 @@ name: type type: text label: 类型 -sort_no: 20 \ No newline at end of file +sort_no: 20 +filterable: true +searchable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/listviews/all.listview.yml b/services/standard-space/main/default/objects/operation_logs/listviews/all.listview.yml index 67966bffc9..020408e804 100644 --- a/services/standard-space/main/default/objects/operation_logs/listviews/all.listview.yml +++ b/services/standard-space/main/default/objects/operation_logs/listviews/all.listview.yml @@ -18,5 +18,9 @@ sort: order: desc searchable_fields: - field: name - - field: remote_user - field: status + - field: type + - field: object + - field: related_to + - field: remote_user + - field: created diff --git a/services/standard-space/main/default/objects/operation_logs/listviews/change_password.listview.yml b/services/standard-space/main/default/objects/operation_logs/listviews/change_password.listview.yml index 16a154f839..375d94b6e7 100644 --- a/services/standard-space/main/default/objects/operation_logs/listviews/change_password.listview.yml +++ b/services/standard-space/main/default/objects/operation_logs/listviews/change_password.listview.yml @@ -18,8 +18,9 @@ sort: order: desc searchable_fields: - field: name - - field: remote_user + - field: status + - field: type + - field: object - field: related_to - - field: is_mobile - - field: is_tablet - - field: status \ No newline at end of file + - field: remote_user + - field: created \ No newline at end of file diff --git a/services/standard-space/main/default/objects/operation_logs/listviews/login.listview.yml b/services/standard-space/main/default/objects/operation_logs/listviews/login.listview.yml index b5bdd0b92a..829e824d17 100644 --- a/services/standard-space/main/default/objects/operation_logs/listviews/login.listview.yml +++ b/services/standard-space/main/default/objects/operation_logs/listviews/login.listview.yml @@ -18,8 +18,9 @@ sort: order: desc searchable_fields: - field: name - - field: remote_user + - field: status + - field: type + - field: object - field: related_to - - field: is_mobile - - field: is_tablet - - field: status \ No newline at end of file + - field: remote_user + - field: created \ No newline at end of file diff --git a/services/standard-space/main/default/objects/organizations/fields/children.field.yml b/services/standard-space/main/default/objects/organizations/fields/children.field.yml index 55b528c26c..142cd44c9e 100644 --- a/services/standard-space/main/default/objects/organizations/fields/children.field.yml +++ b/services/standard-space/main/default/objects/organizations/fields/children.field.yml @@ -5,5 +5,5 @@ reference_to: organizations multiple: true visible_on: '{{false}}' group: systemfields -filterable: true +filterable: false sort_no: 140 diff --git a/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml b/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml index d3ba82b626..7562340ac5 100644 --- a/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml +++ b/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml @@ -15,3 +15,4 @@ optionsFunction: ! |- } sort_no: 170 +filterable: true diff --git a/services/standard-space/main/default/objects/organizations/fields/name.field.yml b/services/standard-space/main/default/objects/organizations/fields/name.field.yml index 52c601989e..dc8244381d 100644 --- a/services/standard-space/main/default/objects/organizations/fields/name.field.yml +++ b/services/standard-space/main/default/objects/organizations/fields/name.field.yml @@ -6,3 +6,4 @@ searchable: true index: true sortable: true sort_no: 100 +filterable: true diff --git a/services/standard-space/main/default/objects/space_users/fields/email.field.yml b/services/standard-space/main/default/objects/space_users/fields/email.field.yml index 6664fe6e71..3b656619e4 100644 --- a/services/standard-space/main/default/objects/space_users/fields/email.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/email.field.yml @@ -5,3 +5,4 @@ searchable: true index: true sort_no: 120 required: true +filterable: true diff --git a/services/standard-space/main/default/objects/space_users/fields/manager.field.yml b/services/standard-space/main/default/objects/space_users/fields/manager.field.yml index cfe22082d1..3526619594 100644 --- a/services/standard-space/main/default/objects/space_users/fields/manager.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/manager.field.yml @@ -2,5 +2,5 @@ name: manager type: lookup label: Superior reference_to: users -filterable: true +filterable: false sort_no: 220 diff --git a/services/standard-space/main/default/objects/space_users/fields/mobile.field.yml b/services/standard-space/main/default/objects/space_users/fields/mobile.field.yml index 23d0ff370b..4ea9ead08f 100644 --- a/services/standard-space/main/default/objects/space_users/fields/mobile.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/mobile.field.yml @@ -5,5 +5,6 @@ searchable: true group: '-' index: true sort_no: 140 +filterable: true amis: tpl: "${IF(pageType == 'record' && formFactor != 'LARGE' && isLookup != true, \"\" + (mobile ? mobile : '') + \"\", (mobile ? mobile : ''))}" \ No newline at end of file diff --git a/services/standard-space/main/default/objects/space_users/fields/organization.field.yml b/services/standard-space/main/default/objects/space_users/fields/organization.field.yml index f4cb6f5b49..4d09766d9b 100644 --- a/services/standard-space/main/default/objects/space_users/fields/organization.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/organization.field.yml @@ -4,5 +4,5 @@ type: lookup reference_to: organizations readonly: true visible_on: '{{global.mode ===''read'' ? true : false}}' -filterable: true +filterable: false sort_no: 180 diff --git a/services/standard-space/main/default/objects/space_users/fields/organizations_parents.field.yml b/services/standard-space/main/default/objects/space_users/fields/organizations_parents.field.yml index f5cf2d09a5..16dea572c4 100644 --- a/services/standard-space/main/default/objects/space_users/fields/organizations_parents.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/organizations_parents.field.yml @@ -5,6 +5,6 @@ reference_to: organizations multiple: true readonly: true visible_on: '{{global.mode ===''read'' ? true : false}}' -filterable: true +filterable: false hidden: false sort_no: 170 diff --git a/services/standard-space/main/default/objects/space_users/fields/position.field.yml b/services/standard-space/main/default/objects/space_users/fields/position.field.yml index ba4805b54a..fc6f6a7c80 100644 --- a/services/standard-space/main/default/objects/space_users/fields/position.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/position.field.yml @@ -2,4 +2,6 @@ name: position type: text label: Title sortable: true +filterable: true sort_no: 210 +searchable: true \ No newline at end of file diff --git a/services/standard-space/main/default/objects/space_users/fields/profile.field.yml b/services/standard-space/main/default/objects/space_users/fields/profile.field.yml index 392aa6720d..78d4609f41 100644 --- a/services/standard-space/main/default/objects/space_users/fields/profile.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/profile.field.yml @@ -18,3 +18,4 @@ filtersFunction: ! |- } defaultValue: user sort_no: 230 +filterable: true diff --git a/services/standard-space/main/default/objects/space_users/fields/user.field.yml b/services/standard-space/main/default/objects/space_users/fields/user.field.yml index 150b253d4f..7a97fa9247 100644 --- a/services/standard-space/main/default/objects/space_users/fields/user.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/user.field.yml @@ -4,5 +4,5 @@ reference_to: users index: true visible_on: "{{false}}" label: User -filterable: true +filterable: false sort_no: 350 diff --git a/services/standard-space/main/default/objects/space_users/fields/username.field.yml b/services/standard-space/main/default/objects/space_users/fields/username.field.yml index f30081301d..26544c23f8 100644 --- a/services/standard-space/main/default/objects/space_users/fields/username.field.yml +++ b/services/standard-space/main/default/objects/space_users/fields/username.field.yml @@ -4,3 +4,4 @@ label: Username searchable: true index: true sort_no: 110 +filterable: true diff --git a/services/standard-space/package.json b/services/standard-space/package.json index 189aedfb1b..3fafb36f2a 100644 --- a/services/standard-space/package.json +++ b/services/standard-space/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-space", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -10,10 +10,10 @@ "steedos" ], "dependencies": { - "@steedos/core": "2.7.1-beta.16", - "@steedos/data-import": "2.7.1-beta.16", - "@steedos/objectql": "2.7.1-beta.16", - "@steedos/service-meteor-package-loader": "2.7.1-beta.16", + "@steedos/core": "2.7.1-beta.17", + "@steedos/data-import": "2.7.1-beta.17", + "@steedos/objectql": "2.7.1-beta.17", + "@steedos/service-meteor-package-loader": "2.7.1-beta.17", "express": "^4.15.4", "fibers": "^5.0.3", "json2xls": "^0.1.2", @@ -22,5 +22,5 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/services/standard-ui/main/default/objects/apps.object.yml b/services/standard-ui/main/default/objects/apps.object.yml index df2644b002..de05135058 100644 --- a/services/standard-ui/main/default/objects/apps.object.yml +++ b/services/standard-ui/main/default/objects/apps.object.yml @@ -20,6 +20,7 @@ fields: type: text required: true searchable: true + filterable: true icon_slds: label: SLDS Icon type: lookup @@ -49,6 +50,8 @@ fields: label: Description type: textarea is_wide: true + searchable: true + filterable: true tabs: label: Tabs type: lookup @@ -146,17 +149,20 @@ fields: label: Open in IE (Using Steedos Desktop) defaultValue: false group: External Application + filterable: true is_use_iframe: type: boolean label: Open with iframe defaultValue: false group: External Application visible_on: "{{false}}" + filterable: true is_new_window: type: boolean label: Open in New Window defaultValue: false group: External Application + filterable: true on_click: type: textarea label: onClick diff --git a/services/standard-ui/main/default/objects/tabs.object.yml b/services/standard-ui/main/default/objects/tabs.object.yml index 8ce54f2222..b44e4d6e0b 100644 --- a/services/standard-ui/main/default/objects/tabs.object.yml +++ b/services/standard-ui/main/default/objects/tabs.object.yml @@ -12,10 +12,14 @@ fields: type: text is_name: true required: true + filterable: true + searchable: true name: label: Api Name type: text required: true + filterable: true + searchable: true icon: label: Icon type: lookup @@ -49,14 +53,17 @@ fields: value: url - label: Page value: page + filterable: true mobile: label: Display on the Mobile type: boolean defaultValue: true + filterable: true desktop: label: Display on the Desktop type: boolean defaultValue: true + filterable: true frame_height: hidden: true inlineHelpText: The height, in pixels of the tab frame. Required for frame and page tabs. diff --git a/services/standard-ui/package.json b/services/standard-ui/package.json index 73c8b59ed9..e25254a806 100644 --- a/services/standard-ui/package.json +++ b/services/standard-ui/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-ui", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "private": false, "publishConfig": { @@ -12,7 +12,7 @@ "description": "steedos package", "repository": {}, "license": "MIT", - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f", + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335", "dependencies": { "clone": "^2.1.2" } diff --git a/services/workflow_time_trigger/package.json b/services/workflow_time_trigger/package.json index 79299b2e08..ffbb9298ca 100644 --- a/services/workflow_time_trigger/package.json +++ b/services/workflow_time_trigger/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/workflow_time_trigger", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": {}, "license": "MIT", @@ -9,9 +9,9 @@ "access": "public" }, "dependencies": { - "@steedos/objectql": "2.7.1-beta.16", + "@steedos/objectql": "2.7.1-beta.17", "eval": "0.1.8", "node-schedule": "2.1.0" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/steedos-packages/service-analytics/package.json b/steedos-packages/service-analytics/package.json index 57c195f0de..fbe84b1992 100644 --- a/steedos-packages/service-analytics/package.json +++ b/steedos-packages/service-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/service-analytics", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "description": "Analytics for product", "scripts": {}, @@ -9,5 +9,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/steedos-packages/standard-process/package.json b/steedos-packages/standard-process/package.json index a539ae764d..5d3e3e99ae 100644 --- a/steedos-packages/standard-process/package.json +++ b/steedos-packages/standard-process/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/standard-process", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": {}, "license": "MIT", @@ -12,5 +12,5 @@ "clone": "^2.1.2", "lodash": "^4.17.21" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/steedos-packages/unpkg/package.json b/steedos-packages/unpkg/package.json index 81847285f8..080ea44880 100644 --- a/steedos-packages/unpkg/package.json +++ b/steedos-packages/unpkg/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/unpkg", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": {}, "license": "MIT", @@ -8,5 +8,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/steedos-packages/webapp-accounts/package.json b/steedos-packages/webapp-accounts/package.json index 4362bbc5a7..a2365164f9 100644 --- a/steedos-packages/webapp-accounts/package.json +++ b/steedos-packages/webapp-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/webapp-accounts", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "scripts": {}, "files": [ @@ -15,5 +15,5 @@ "dependencies": { "lodash": "^4.17.21" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/steedos-packages/webapp-desktop/package.json b/steedos-packages/webapp-desktop/package.json index 718e356fda..045bafed42 100644 --- a/steedos-packages/webapp-desktop/package.json +++ b/steedos-packages/webapp-desktop/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/webapp-desktop", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "description": "A Steedos App", "main": "package.service.js", "license": "MIT", @@ -9,5 +9,5 @@ "access": "public" }, "scripts": {}, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" } diff --git a/steedos-packages/webapp-public/package.json b/steedos-packages/webapp-public/package.json index 8e67f40b5a..02b47c6c20 100644 --- a/steedos-packages/webapp-public/package.json +++ b/steedos-packages/webapp-public/package.json @@ -1,6 +1,6 @@ { "name": "@steedos/webapp-public", - "version": "2.7.1-beta.16", + "version": "2.7.1-beta.17", "main": "package.service.js", "description": "public assets for steedos", "scripts": {}, @@ -12,5 +12,5 @@ "dependencies": { "lodash": "^4.17.21" }, - "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f" + "gitHead": "a47b445992e1ced339572a86f50ed1c75ed12335" }