Skip to content

Commit dabd20c

Browse files
author
pipeline
committed
v20.1.47 is released
1 parent 885f095 commit dabd20c

File tree

25,385 files changed

+2175542
-183705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

25,385 files changed

+2175542
-183705
lines changed

controls/barcodegenerator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-barcode-generator",
3-
"version": "19.1.66",
3+
"version": "19.3.0",
44
"description": "Barcode generator component is a pure JavaScript library which will convert a string to Barcode and show it to the user. This supports major 1D and 2D barcodes including coda bar, code 128, QR Code.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/barcodegenerator/spec/barcode/core/UPC.spec.ts

+38-7
Large diffs are not rendered by default.

controls/barcodegenerator/src/barcode/one-dimension.ts

+9
Original file line numberDiff line numberDiff line change
@@ -302,16 +302,25 @@ export abstract class OneDimension extends BarcodeBase {
302302
let checkVAl: boolean = (textOptions.string === this.value.substr(0, 6)) ? true : false;
303303
textOptions.string = checkVAl ? this.value.substr(0, 1) : textOptions.string.substr(0, 5);
304304
let xPosition: number = checkVAl ? options[0].x / 2 : options[options.length - 1].x + textOptions.stringSize;
305+
let yPosition: number = 0;
305306
if (checkVAl) {
306307
let tempPosition: number = textOptions.x;
307308
textOptions.x = xPosition;
309+
yPosition = textOptions.y;
308310
this.drawText(canvas as HTMLCanvasElement, textOptions);
309311
textOptions.x = tempPosition;
312+
if (!this.isSvgMode) {
313+
textOptions.y = yPosition;
314+
}
310315
textOptions.string = this.value.substr(1, 5);
311316
this.updateOverlappedTextPosition((endValue - startValue), textOptions, textSize, startValue, textProperty, endValue);
312317
} else {
313318
this.updateOverlappedTextPosition((endValue - startValue), textOptions, textSize, startValue, textProperty, endValue);
319+
yPosition = textOptions.y;
314320
this.drawText(canvas as HTMLCanvasElement, textOptions);
321+
if (!this.isSvgMode) {
322+
textOptions.y = yPosition;
323+
}
315324
textOptions.string = this.value.substr(11, 12);
316325
textOptions.x = xPosition;
317326
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import './fluent-definition.scss';

controls/barcodegenerator/styles/barcode/_fluent-definition.scss

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@import 'ej2-base/styles/fluent-dark-definition.scss';
2+
@import 'fluent-dark-definition.scss';
3+
@import 'all.scss';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@import 'ej2-base/styles/fluent-definition.scss';
2+
@import 'fluent-definition.scss';
3+
@import 'all.scss';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import 'barcode/fluent-dark.scss';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import 'barcode/fluent.scss';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
# Theme Studio Application
2+
3+
We have created the Asp.net core application to generate our available themes for our components and added our available components. We can use this application to customize and generate the themes for our components.
4+
5+
We have migrated or theme studio application to Core application and modified the structure. So, hereafter we have planned to maintain the all component’s themes file in this repository. Then ux team will using this repository to add the new themes for our components.
6+
7+
## Prerequisites
8+
9+
1. Install the serve package as global
10+
11+
```cmd
12+
npm i -g serve
13+
```
14+
15+
## Steps to add new theme
16+
17+
Please find the below steps to add the new themes in theme studio application.
18+
19+
1. Clone ej2-theme-studio repository from GitLab using the below link.
20+
21+
https://gitlab.syncfusion.com/essential-studio/ej2-theme-studio/tree/development
22+
2. Install the required node_modules using **npm install** command.
23+
3. For adding new theme in theme studio, need to process the below steps.
24+
25+
### To run the individual samples
26+
27+
1. Run the **gulp prepare-new-theme** gulp task to generate new theme with our latest existing themes.
28+
29+
For example, if we need to generate new theme, run the above mentioned gulp task and give the theme name in command prompt. Then it will generate the new theme file with our latest theme changes in this location **(./styles/**/*-definition.scss)**.
30+
31+
In config.json file, we need to add the latest theme name like below.
32+
33+
```json
34+
latest: "bootstrap5"
35+
```
36+
37+
![prepare new theme](images/prepare-new.png)
38+
39+
![fluent](images/fluent.png)
40+
41+
2. **gulp compile-themes**, gulp task will get all scss files from dist folder and then generated with respective css files for our themes.
42+
43+
3. Then we can use this generated css files in our demos and check the styles for our components. To check the samples run the **gulp test-samples** gulp task to run the local samples.
44+
45+
![test-samples](images/test-samples.png)
46+
47+
![serve](images/serve.png)
48+
49+
4. Open the web browser and run the localhost: 5000, then the component lists will be showed as like below.
50+
51+
![components](images/components-list.png)
52+
53+
5. Then you can click any one of the component link, you can see the output of the components as below.
54+
55+
![button](images/button.png)
56+
57+
> If you want to change the color or any styles, you can change from styles folder. Then run the **gulp test-samples**, the changes will be refreshed.
58+
59+
### To run the theme studio application
60+
61+
While using Visual studio for running this application, follow the below steps to run the theme studio.
62+
63+
1. **gulp combine-themes** – combine-themes gulp task to generate the scss files for our components with required files and it placed it into this location **(./src/wwwroot/ej2-resource/styles/*/*.scss)**.
64+
65+
2. After that, **gulp scss-files** gulp task will be called, In this task all components theme files are combined in single theme file in this location **(./dist/input/*.scss)**.
66+
67+
3. Then **dynamic-theme** gulp task to add the text file in template folder for theme compilation.
68+
69+
4. Then run the application in visual studio or run the **dotnet run** command in command prompt.
70+
71+
## Run the Samples with Overall styles
72+
73+
To check the over all styles in our components, add the changes in styles folder in respective component’s definition files.
74+
75+
Then run the **gulp test-samples**, the changes will be applied in our components, and you can see the changes in chrome web browser.
76+
77+
## Moving styles repo to theme studio and Styles maintenance for controls
78+
79+
We are going to move the styles to theme studio application and hereafter, we will maintain all styles from theme studio itself. While moving styles to theme studio application, all components’ styles are placed in same place. So, UX team will get styles easily and if any changes required, they will proceed using this repository.
80+
81+
https://gitlab.syncfusion.com/essential-studio/ej2-theme-studio/tree/development/styles
82+
83+
We have also segregated the themestudio repository as in below image.
84+
85+
![Themestudio-repo](images/theme-studio-repo.png)
86+
87+
**Src** – Source folder contains the Themestudio application.
88+
**Styles** - Styles folder contains all the component styles which are segregated based on the repositories.
89+
**test-sample** – Holds the sample of all components.
90+
91+
So, we have planned to remove the styles folder from components repository, and we have added the automation for this process.
92+
93+
• Since we have moved styles to theme studio repo, the current styles folders will be in read only in components repository for short period(will remove once everything completed). So the components repository will maintain only source.
94+
• If you want to add any changes in styles, you can use the theme studio repository.
95+
• We have processed the automation to run the individual samples and whole theme studio application in this repository.
96+
97+
We have segregated the components in the themestudio repository as Repository based folders which are named using the package name given in the component repository. Below are the repository name and folder name to be maintained for the component in the Themestudio.
98+
99+
|**Folder name in theme studio** | **Component repository** |
100+
|--------------------------------|--------------------------|
101+
|barcode-generator | ej2-barcode-generator |
102+
|base | ej2-base-library |
103+
|buttons| ej2-button-components |
104+
|calendars | ej2-calendar-components |
105+
|diagrams | ej2-diagram-components |
106+
|documenteditor | ej2-documenteditor-components |
107+
|drawings | ej2-drawings |
108+
|dropdowns | ej2-dropdown-components |
109+
|filemanager | ej2-filemanager-component |
110+
|gantt | ej2-gantt-component |
111+
|grid | ej2-grid-component |
112+
|inplace-editor | ej2-inplace-editor-components |
113+
|inputs| ej2-input-components |
114+
|Kanban | ej2-kanban-component |
115+
|layouts | ej2-layout-components |
116+
|lists | ej2-list-components |
117+
|navigations | ej2-navigation-components |
118+
|notifications | ej2-notification-components |
119+
|pdfviewer | ej2-pdfviewer-library |
120+
|pivotview | ej2-pivot-components |
121+
|popups | ej2-popup-components |
122+
|querybuilder | ej2-querybuilder-component |
123+
|richtexteditor | ej2-richtexteditor-component |
124+
|schedule | ej2-schedule-component |
125+
|splitbuttons | ej2-splitbuttons-components |
126+
|spreadsheet | ej2-spreadsheet-component |
127+
|treegrid | ej2-treegrid-component |
128+
129+
![folder names](images/folder-names.png)
130+
131+
> There will be no changes in the package generation and ci process. Once a commit is made in the themestudio application component ci will be automatically triggered for the component in Jenkins.
132+
133+
## Style Maintenance for controls
134+
135+
Hereafter, we will maintain only the component’s source in repository. **Styles** folders are not maintained in the components repository.
136+
137+
> If you want to add any changes in styles, you can check it local with your component’s repository. For generating the styles, the styles folder will be cloned from theme studio application for your components. So, you can add the changes and ensured it in your local. After that, you can commit the changes in theme studio repository. Once you pushed the changes, automatically CI will trigger and published the changes in your packages.
138+
139+
If you want to add any styles / adding any bug fixes for the control we need to make the changes in the **Themestudio** repository only, if you want to change a control style directly make changes in the styles folder, for example if you want to change in button component you need to change the **scss** file in the **styles/buttons/button/**.
140+
141+
![button styles](images/button-styles.png)
142+
143+
If any changes made in theme studio application, automatically the component’s CI will be triggered and published the styles in components packages.
144+
145+
If you want to check the style changes in local, you can run the below command to generate the styles.
146+
147+
```cmd
148+
gulp ci-compile
149+
```
150+
151+
## Test samples in the theme studio application
152+
153+
We have added all control samples in the themestudio repository under the **test-samples** this step will provide an easier way to view control samples in a single place. UX team will check new theme demo for controls in the demo section only.
154+
155+
### Sample modification and adding new sample in the test-samples
156+
157+
We are maintaining the all the control samples separated as individual control wise folders in **test-samples**.
158+
159+
• If you want to modify already created sample just edit the control sample without changing the structure of the sample edit only <body> section.
160+
• For adding new sample create a folder named in control and add a index.html file use the below template and add the component in the body section.
161+
162+
```html
163+
<html>
164+
{{head}}
165+
</head>
166+
167+
<body>
168+
169+
<!-- Control html code -->
170+
<script>
171+
// Control rendering code
172+
</script>
173+
</body>
174+
175+
</html>
176+
```
177+
178+
![html file](images/index-html.png)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Theme studio
2+
Repository for theme studio.
3+
4+
## run the build Configuration process
5+
. **gulp _build-Configuration_** – run the all the build configuration process .

controls/barcodegenerator/themestudio/src/wwwroot/ej2-resource/styles/allfusion.scss

+67,598
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)