Skip to content

Commit

Permalink
Merge pull request #1753 from smeup/dev-to-mas
Browse files Browse the repository at this point in the history 
9.3.0
  • Loading branch information
@pasere-smeup
pasere-smeup authored Dec 12, 2023
2 parents 8246bd1 + 1142253 commit f61f2e6
Show file tree
Hide file tree
Showing 69 changed files with 59,545 additions and 6,100 deletions.
20 changes: 10 additions & 10 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": true
},
"eslint.validate": ["vue", "html", "javascript", "tipescript"],
"eslint.validate": ["vue", "html", "javascript", "typescript"],
"eslint.run": "onSave",
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "octref.vetur"
"editor.defaultFormatter": "octref.vetur"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
Binary file removed .yarn/install-state.gz
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/ketchup-react/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sme.up/ketchup-react",
"version": "9.2.0",
"version": "9.3.0",
"module": "dist/index.js",
"typings": "dist/index.d.ts",
"keywords": [
Expand All @@ -20,7 +20,7 @@
"description": "Ketchup React Components library by smeup",
"license": "Apache-2.0",
"dependencies": {
"@sme.up/ketchup": "^9.2.0",
"@sme.up/ketchup": "^9.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
15 changes: 15 additions & 0 deletions packages/ketchup-react/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export const KupCheckbox = /*@__PURE__*/createReactComponent<JSX.KupCheckbox, HT
export const KupChip = /*@__PURE__*/createReactComponent<JSX.KupChip, HTMLKupChipElement>('kup-chip');
export const KupColorPicker = /*@__PURE__*/createReactComponent<JSX.KupColorPicker, HTMLKupColorPickerElement>('kup-color-picker');
export const KupCombobox = /*@__PURE__*/createReactComponent<JSX.KupCombobox, HTMLKupComboboxElement>('kup-combobox');
export const KupCustomTaskListHeader = /*@__PURE__*/createReactComponent<JSX.KupCustomTaskListHeader, HTMLKupCustomTaskListHeaderElement>('kup-custom-task-list-header');
export const KupCustomTaskListTable = /*@__PURE__*/createReactComponent<JSX.KupCustomTaskListTable, HTMLKupCustomTaskListTableElement>('kup-custom-task-list-table');
export const KupDashboard = /*@__PURE__*/createReactComponent<JSX.KupDashboard, HTMLKupDashboardElement>('kup-dashboard');
export const KupDataTable = /*@__PURE__*/createReactComponent<JSX.KupDataTable, HTMLKupDataTableElement>('kup-data-table');
export const KupDatePicker = /*@__PURE__*/createReactComponent<JSX.KupDatePicker, HTMLKupDatePickerElement>('kup-date-picker');
Expand All @@ -32,8 +34,12 @@ export const KupDropdownButton = /*@__PURE__*/createReactComponent<JSX.KupDropdo
export const KupEchart = /*@__PURE__*/createReactComponent<JSX.KupEchart, HTMLKupEchartElement>('kup-echart');
export const KupFamilyTree = /*@__PURE__*/createReactComponent<JSX.KupFamilyTree, HTMLKupFamilyTreeElement>('kup-family-tree');
export const KupForm = /*@__PURE__*/createReactComponent<JSX.KupForm, HTMLKupFormElement>('kup-form');
export const KupGantt = /*@__PURE__*/createReactComponent<JSX.KupGantt, HTMLKupGanttElement>('kup-gantt');
export const KupGanttCalendar = /*@__PURE__*/createReactComponent<JSX.KupGanttCalendar, HTMLKupGanttCalendarElement>('kup-gantt-calendar');
export const KupGauge = /*@__PURE__*/createReactComponent<JSX.KupGauge, HTMLKupGaugeElement>('kup-gauge');
export const KupGrid = /*@__PURE__*/createReactComponent<JSX.KupGrid, HTMLKupGridElement>('kup-grid');
export const KupGridRenderer = /*@__PURE__*/createReactComponent<JSX.KupGridRenderer, HTMLKupGridRendererElement>('kup-grid-renderer');
export const KupHorizontalScroll = /*@__PURE__*/createReactComponent<JSX.KupHorizontalScroll, HTMLKupHorizontalScrollElement>('kup-horizontal-scroll');
export const KupIframe = /*@__PURE__*/createReactComponent<JSX.KupIframe, HTMLKupIframeElement>('kup-iframe');
export const KupImage = /*@__PURE__*/createReactComponent<JSX.KupImage, HTMLKupImageElement>('kup-image');
export const KupImageList = /*@__PURE__*/createReactComponent<JSX.KupImageList, HTMLKupImageListElement>('kup-image-list');
Expand All @@ -44,15 +50,24 @@ export const KupNavBar = /*@__PURE__*/createReactComponent<JSX.KupNavBar, HTMLKu
export const KupNumericPicker = /*@__PURE__*/createReactComponent<JSX.KupNumericPicker, HTMLKupNumericPickerElement>('kup-numeric-picker');
export const KupPhotoFrame = /*@__PURE__*/createReactComponent<JSX.KupPhotoFrame, HTMLKupPhotoFrameElement>('kup-photo-frame');
export const KupPlanner = /*@__PURE__*/createReactComponent<JSX.KupPlanner, HTMLKupPlannerElement>('kup-planner');
export const KupPlannerRenderer = /*@__PURE__*/createReactComponent<JSX.KupPlannerRenderer, HTMLKupPlannerRendererElement>('kup-planner-renderer');
export const KupProbe = /*@__PURE__*/createReactComponent<JSX.KupProbe, HTMLKupProbeElement>('kup-probe');
export const KupProgressBar = /*@__PURE__*/createReactComponent<JSX.KupProgressBar, HTMLKupProgressBarElement>('kup-progress-bar');
export const KupQlik = /*@__PURE__*/createReactComponent<JSX.KupQlik, HTMLKupQlikElement>('kup-qlik');
export const KupRadio = /*@__PURE__*/createReactComponent<JSX.KupRadio, HTMLKupRadioElement>('kup-radio');
export const KupRating = /*@__PURE__*/createReactComponent<JSX.KupRating, HTMLKupRatingElement>('kup-rating');
export const KupSnackbar = /*@__PURE__*/createReactComponent<JSX.KupSnackbar, HTMLKupSnackbarElement>('kup-snackbar');
export const KupSpinner = /*@__PURE__*/createReactComponent<JSX.KupSpinner, HTMLKupSpinnerElement>('kup-spinner');
export const KupStandardTooltip = /*@__PURE__*/createReactComponent<JSX.KupStandardTooltip, HTMLKupStandardTooltipElement>('kup-standard-tooltip');
export const KupSwitch = /*@__PURE__*/createReactComponent<JSX.KupSwitch, HTMLKupSwitchElement>('kup-switch');
export const KupSwitcher = /*@__PURE__*/createReactComponent<JSX.KupSwitcher, HTMLKupSwitcherElement>('kup-switcher');
export const KupTabBar = /*@__PURE__*/createReactComponent<JSX.KupTabBar, HTMLKupTabBarElement>('kup-tab-bar');
export const KupTaskGantt = /*@__PURE__*/createReactComponent<JSX.KupTaskGantt, HTMLKupTaskGanttElement>('kup-task-gantt');
export const KupTaskList = /*@__PURE__*/createReactComponent<JSX.KupTaskList, HTMLKupTaskListElement>('kup-task-list');
export const KupTaskListHeader = /*@__PURE__*/createReactComponent<JSX.KupTaskListHeader, HTMLKupTaskListHeaderElement>('kup-task-list-header');
export const KupTaskListTable = /*@__PURE__*/createReactComponent<JSX.KupTaskListTable, HTMLKupTaskListTableElement>('kup-task-list-table');
export const KupTextField = /*@__PURE__*/createReactComponent<JSX.KupTextField, HTMLKupTextFieldElement>('kup-text-field');
export const KupTimePicker = /*@__PURE__*/createReactComponent<JSX.KupTimePicker, HTMLKupTimePickerElement>('kup-time-picker');
export const KupTooltip = /*@__PURE__*/createReactComponent<JSX.KupTooltip, HTMLKupTooltipElement>('kup-tooltip');
export const KupTree = /*@__PURE__*/createReactComponent<JSX.KupTree, HTMLKupTreeElement>('kup-tree');
export const KupVerticalScroll = /*@__PURE__*/createReactComponent<JSX.KupVerticalScroll, HTMLKupVerticalScrollElement>('kup-vertical-scroll');
2 changes: 1 addition & 1 deletion packages/ketchup-showcase/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@sme.up/ketchup": "^9.2.0",
"@sme.up/ketchup": "^9.3.0",
"core-js": "^3.30.2",
"vue": "^2.6.14",
"vue-router": "^3.5.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/ketchup-showcase/src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
@kup-tree-nodeselected="treeClick"
></kup-tree
><div class="version"
><a href="https://github.com/smeup/ketchup/releases/tag/v9.2.0"
>v9.2.0</a
><a href="https://github.com/smeup/ketchup/releases/tag/v9.3.0"
>v9.3.0</a
></div
></div
>
Expand Down
178 changes: 176 additions & 2 deletions packages/ketchup-showcase/src/mock/mockedPlanner.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ export const mockedProps = {
phaseColorCol: 'PHASE_COL',
phaseColumns: ['SEC_START', 'SEC_END'],
showSecondaryDates: false,
detailHeight: 200,
taskHeight: 200,
};

export function getMockupTaskDatas() {
Expand Down Expand Up @@ -268,7 +270,7 @@ export function getMockupTaskDatas() {
value: '1',
},
NAME: {
value: 'G456',
value: 'G503',
},
START: {
obj: {
Expand Down Expand Up @@ -311,7 +313,7 @@ export function getMockupTaskDatas() {
value: '2',
},
NAME: {
value: 'G457',
value: 'G504',
},
START: {
obj: {
Expand Down Expand Up @@ -347,6 +349,178 @@ export function getMockupTaskDatas() {
},
},
},
{
id: '3',
cells: {
ID: {
value: '3',
},
NAME: {
value: 'G505',
},
START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-11-03',
},
END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-12-28',
},
SEC_START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-11-03',
},
SEC_END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-12-28',
},
},
},
{
id: '4',
cells: {
ID: {
value: '4',
},
NAME: {
value: 'G506',
},
START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-05-19',
},
END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-09-18',
},
SEC_START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-05-19',
},
SEC_END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-09-18',
},
},
},
{
id: '5',
cells: {
ID: {
value: '5',
},
NAME: {
value: 'G507',
},
START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-10-19',
},
END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-12-18',
},
SEC_START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-10-19',
},
SEC_END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-12-18',
},
},
},
{
id: '6',
cells: {
ID: {
value: '6',
},
NAME: {
value: 'G508',
},
START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-11-15',
},
END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-12-25',
},
SEC_START: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-11-15',
},
SEC_END: {
obj: {
t: 'D8',
p: '*YYMD',
k: '',
},
value: '2022-12-25',
},
},
},
],
};
}
Expand Down
28 changes: 12 additions & 16 deletions packages/ketchup/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sme.up/ketchup",
"version": "9.2.0",
"version": "9.3.0",
"keywords": [
"smeup",
"KetchUP",
Expand Down Expand Up @@ -35,9 +35,7 @@
"test:speccov": "rimraf target && npm run build:setup && stencil test --spec --coverage",
"test:e2e": "npm run build:setup && stencil test --e2e",
"test": "npm run build:setup && stencil test --spec --e2e",
"test.watch": "npm run build:setup && stencil test --spec --e2e --watchAll",
"react:dev": "npx link ../../../gantt-component && cd ../../../gantt-component && npx link ../ketchup/packages/ketchup/node_modules/react ../ketchup/packages/ketchup/node_modules/react-dom && cd ../ketchup/packages/ketchup",
"jenkins:react:dev": "npx link ../../../GanttComponent-Develop-Continuum && cd ../../../GanttComponent-Develop-Continuum && npx link ../KetchUP-Develop-Continuum/packages/ketchup/node_modules/react ../KetchUP-Develop-Continuum/packages/ketchup/node_modules/react-dom && cd ../KetchUP-Develop-Continuum/packages/ketchup"
"test.watch": "npm run build:setup && stencil test --spec --e2e --watchAll"
},
"dependencies": {
"@fullcalendar/core": "^6.1.8",
Expand All @@ -48,30 +46,28 @@
"@material/form-field": "^14.0.0",
"@material/ripple": "^14.0.0",
"@material/textfield": "^14.0.0",
"@sme.up/gantt-component": "^1.3.30",
"d3-shape": "^3.2.0",
"dayjs": "^1.11.7",
"echarts": "^5.4.2",
"hex-to-css-filter": "^5.4.0",
"html2canvas": "^1.4.1",
"interactjs": "1.10.12",
"jquery": "^3.7.0",
"numeral": "^2.0.6",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"resize-observer": "^1.0.4",
"vanilla-picker": "^2.12.1"
},
"devDependencies": {
"@stencil/core": "^4.4.0",
"@stencil/core": "^4.8.1",
"@stencil/react-output-target": "0.5.3",
"@stencil/sass": "^3.0.6",
"jest": "^27.4.5",
"jest-cli": "^27.4.5",
"jest-html-reporter": "^3.7.1",
"jest-junit": "^15.0.0",
"puppeteer": "^20.4.0",
"rimraf": "^5.0.1",
"sass": "^1.62.1"
"@stencil/sass": "^3.0.7",
"jest": "^29.7.0",
"jest-cli": "^29.7.0",
"jest-html-reporter": "^3.10.2",
"jest-junit": "^16.0.0",
"puppeteer": "^21.6.0",
"rimraf": "^5.0.5",
"sass": "^1.69.5"
},
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit f61f2e6

Please sign in to comment.