From 2f6e547687cc1e8e1ade8f2d6cc1bf492b453f3a Mon Sep 17 00:00:00 2001 From: sspku-yqLiu Date: Thu, 27 Aug 2020 12:58:46 +0800 Subject: [PATCH] chore: ci --- .../iceworks-app/src/locales/en-US.json | 6 +- .../iceworks-app/src/locales/zh-CN.json | 5 +- .../iceworks-app/src/views/pagesView.ts | 9 +- .../web/src/callService.ts | 1 - .../web/src/pages/PageCreator/configForm.tsx | 6 +- packages/block-service/package.json | 3 +- packages/material-ui/package.json | 2 +- packages/template-service/package.json | 3 +- yarn.lock | 98 ++++++++++++++++++- 9 files changed, 118 insertions(+), 15 deletions(-) diff --git a/extensions/iceworks-app/src/locales/en-US.json b/extensions/iceworks-app/src/locales/en-US.json index 11e86d8f6..1980ff6b9 100644 --- a/extensions/iceworks-app/src/locales/en-US.json +++ b/extensions/iceworks-app/src/locales/en-US.json @@ -30,5 +30,9 @@ "extension.iceworksApp.showDepsQuickPick.quickPickItem.detail": "Install <%= label %>", "extension.iceworksApp.openEntryFile.ErrorMessage": "Cannot find entry", "extension.iceworksApp.extension.title": "Iceworks Settings", - "extension.iceworksApp.extension.emptyWorkplace": "Current workspace is empty, please open or create an application." + "extension.iceworksApp.extension.emptyWorkplace": "Current workspace is empty, please open or create an application.", + "extension.iceworksApp.views.pageViews.createPage": "Create Page", + "extension.iceworksApp.views.pageViews.createPageDetail": "Create page through page templates", + "extension.iceworksApp.views.pageViews.generatePage": "Generate Page", + "extension.iceworksApp.views.pageViews.generatePageDetail": "Generate page through assmebling component materials" } diff --git a/extensions/iceworks-app/src/locales/zh-CN.json b/extensions/iceworks-app/src/locales/zh-CN.json index 80393c358..9b21235ca 100644 --- a/extensions/iceworks-app/src/locales/zh-CN.json +++ b/extensions/iceworks-app/src/locales/zh-CN.json @@ -30,5 +30,8 @@ "extension.iceworksApp.showDepsQuickPick.quickPickItem.detail": "安装 <%= label %>", "extension.iceworksApp.openEntryFile.ErrorMessage": "没有找到入口", "extension.iceworksApp.extension.title": "设置 - Iceworks", - "extension.iceworksApp.extension.emptyWorkplace": "当前工作区为空，请打开应用或新建应用。" + "extension.iceworksApp.views.pageViews.createPage": "创建页面", + "extension.iceworksApp.views.pageViews.createPageDetail": "通过配置模板的方式创建页面", + "extension.iceworksApp.views.pageViews.generatePage": "生成页面", + "extension.iceworksApp.views.pageViews.generatePageDetail": "通过区块组装的方式生成页面" } diff --git a/extensions/iceworks-app/src/views/pagesView.ts b/extensions/iceworks-app/src/views/pagesView.ts index 07a7a113d..152a0697a 100644 --- a/extensions/iceworks-app/src/views/pagesView.ts +++ b/extensions/iceworks-app/src/views/pagesView.ts @@ -4,6 +4,7 @@ import * as path from 'path'; import { checkPathExists, registerCommand } from '@iceworks/common-service'; import { pagesPath, projectPath } from '@iceworks/project-service'; import openEntryFile from '../openEntryFile'; +import i18n from '../i18n'; export class PagesProvider implements vscode.TreeDataProvider { private workspaceRoot: string; @@ -87,13 +88,13 @@ class PageTreeItem extends vscode.TreeItem { const addPageQuickPickItems: any[] = [ { - label: '创建页面', - detail: '通过配置模板的方式创建页面', + label: i18n.format('extension.iceworksApp.views.pageViews.createPage'), + detail: i18n.format('extension.iceworksApp.views.pageViews.createPageDetail'), command: 'iceworks-ui-builder.create-page', }, { - label: '生成页面', - detail: '通过区块组装的方式生成页面', + label: i18n.format('extension.iceworksApp.views.pageViews.generatePage'), + detail: i18n.format('extension.iceworksApp.views.pageViews.generatePageDetail'), command: 'iceworks-ui-builder.generate-page', }, ]; diff --git a/extensions/iceworks-ui-builder/web/src/callService.ts b/extensions/iceworks-ui-builder/web/src/callService.ts index c55af3cd5..62c5bc5df 100644 --- a/extensions/iceworks-ui-builder/web/src/callService.ts +++ b/extensions/iceworks-ui-builder/web/src/callService.ts @@ -6,7 +6,6 @@ export default async function callService(service: string, method: string, ...ar if (typeof acquireVsCodeApi === 'function') { return await originCallService.apply(null, arguments); } else { - console.log(require(`../mocks/${service}/${method}`)); return require(`../mocks/${service}/${method}`); } } diff --git a/extensions/iceworks-ui-builder/web/src/pages/PageCreator/configForm.tsx b/extensions/iceworks-ui-builder/web/src/pages/PageCreator/configForm.tsx index 081281ddf..c0e11f706 100644 --- a/extensions/iceworks-ui-builder/web/src/pages/PageCreator/configForm.tsx +++ b/extensions/iceworks-ui-builder/web/src/pages/PageCreator/configForm.tsx @@ -113,13 +113,15 @@ export default ({ templateSchema, pageName, resetData, setCurrentStep, currentSt ) : ( <>

+ ß {formilySchema.current.title || intl.formatMessage({ id: 'web.iceworksUIBuilder.pageCreator.defaultTitle' })}

-

+

+ ß {formilySchema.current.description || intl.formatMessage({ id: 'web.iceworksUIBuilder.pageCreator.defaultDescription' })} -

+

=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -11899,6 +11941,23 @@ mkdirp@0.5.5, mkdirp@0.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp dependencies: minimist "^1.2.5" +mocha@^5.2.0: + version "5.2.0" + resolved "https://registry.npm.taobao.org/mocha/download/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" + integrity sha1-bYrlCPWRZ/lA8rWzxKYSrlDJCuY= + dependencies: + browser-stdout "1.3.1" + commander "2.15.1" + debug "3.1.0" + diff "3.5.0" + escape-string-regexp "1.0.5" + glob "7.1.2" + growl "1.10.5" + he "1.1.1" + minimatch "3.0.4" + mkdirp "0.5.1" + supports-color "5.4.0" + mocha@^7.2.0: version "7.2.0" resolved "https://registry.npm.taobao.org/mocha/download/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604" @@ -13172,6 +13231,11 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" +path-to-regexp@^6.1.0: + version "6.1.0" + resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-6.1.0.tgz#0b18f88b7a0ce0bfae6a25990c909ab86f512427" + integrity sha1-Cxj4i3oM4L+uaiWZDJCauG9RJCc= + path-type@^1.0.0: version "1.1.0" resolved "https://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -15560,7 +15624,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12: +source-map-support@^0.5.0, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12: version "0.5.19" resolved "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha1-qYti+G3K9PZzmWSMCFKRq56P7WE= @@ -16292,6 +16356,13 @@ sugarss@^2.0.0: dependencies: postcss "^7.0.2" +supports-color@5.4.0: + version "5.4.0" + resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + integrity sha1-HGszdALCE3YF7+GfEP7DkPb6q1Q= + dependencies: + has-flag "^3.0.0" + supports-color@6.0.0: version "6.0.0" resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a" @@ -17606,6 +17677,27 @@ vm-browserify@^1.0.1: resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha1-eGQcSIuObKkadfUR56OzKobl3aA= +vscode-test@^0.4.1: + version "0.4.3" + resolved "https://registry.npm.taobao.org/vscode-test/download/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8" + integrity sha1-Rh6/JfxLyT132YKu1VZlii4rkLg= + dependencies: + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + +vscode@^1.1.37: + version "1.1.37" + resolved "https://registry.npm.taobao.org/vscode/download/vscode-1.1.37.tgz#c2a770bee4bb3fff765e2b72c7bcc813b8a6bb0a" + integrity sha1-wqdwvuS7P/92Xityx7zIE7imuwo= + dependencies: + glob "^7.1.2" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + mocha "^5.2.0" + semver "^5.4.1" + source-map-support "^0.5.0" + vscode-test "^0.4.1" + w3c-hr-time@^1.0.1: version "1.0.2" resolved "https://registry.npm.taobao.org/w3c-hr-time/download/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"