Skip to content

Commit 3c2256e

Browse files
iamfaraniamfaran
committed
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
2 parents e192087 + cdcc74e commit 3c2256e

Some content is hidden

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

69 files changed

+9530
-155
lines changed

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.3
1+
2.6.4

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.6.3",
3+
"version": "2.6.4",
44
"type": "module",
55
"private": true,
66
"workspaces": [

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.4",
3+
"version": "2.6.5",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder-core/lib/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3331,7 +3331,7 @@ function styleNamespace(id) {
33313331
function evalStyle(id, css, globalStyle) {
33323332
var _a;
33333333
var styleId = styleNamespace(id);
3334-
var prefixId = globalStyle ? id : "#".concat(id);
3334+
var prefixId = globalStyle ? id : ".".concat(id);
33353335
var compiledCSS = "";
33363336
css.forEach(function (i) {
33373337
if (!i.trim()) {

‎client/packages/lowcoder-design/src/icons/index.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ export { ReactComponent as VideoScreenshareCompIconSmall } from "./v2/screen-sha
345345
export { ReactComponent as SignatureCompIconSmall } from "./v2/signature-s.svg";
346346
export { ReactComponent as StepCompIconSmall } from "./v2/steps-s.svg";
347347

348+
348349
export { ReactComponent as CandlestickChartCompIconSmall } from "./v2/candlestick-chart-s.svg"; // new
349350
export { ReactComponent as FunnelChartCompIconSmall } from "./v2/funnel-chart-s.svg"; // new
350351
export { ReactComponent as GaugeChartCompIconSmall } from "./v2/gauge-chart-s.svg"; // new
@@ -364,6 +365,10 @@ export { ReactComponent as PivotTableCompIconSmall } from "./v2/pivot-table-s.sv
364365
export { ReactComponent as TurnstileCaptchaCompIconSmall } from "./v2/turnstile-captcha-s.svg"; // new
365366
export { ReactComponent as GanttCompIconSmall } from "./v2/gantt-chart-s.svg"; // new
366367

368+
export { ReactComponent as PieChartCompIconSmall } from "./v2/pie-chart-s.svg"; // new
369+
export { ReactComponent as BarChartCompIconSmall } from "./v2/bar-chart-s.svg"; // new
370+
export { ReactComponent as LineChartCompIconSmall } from "./v2/line-chart-s.svg"; // new
371+
export { ReactComponent as ScatterChartCompIconSmall } from "./v2/scatter-chart-s.svg"; // new
367372

368373
// medium
369374
export { ReactComponent as AudioCompIcon } from "./v2/audio-player-m.svg";
@@ -465,6 +470,11 @@ export { ReactComponent as ThemeriverChartCompIcon } from "./v2/themeriver-chart
465470
export { ReactComponent as TreeChartCompIcon } from "./v2/tree-chart-m.svg";
466471
export { ReactComponent as TreemapChartCompIcon } from "./v2/treemap-chart-m.svg";
467472

473+
export { ReactComponent as PieChartCompIcon } from "./v2/pie-chart-m.svg"; // new
474+
export { ReactComponent as BarChartCompIcon } from "./v2/bar-chart-m.svg"; // new
475+
export { ReactComponent as LineChartCompIcon } from "./v2/line-chart-m.svg"; // new
476+
export { ReactComponent as ScatterChartCompIcon } from "./v2/scatter-chart-m.svg"; // new
477+
468478
export { ReactComponent as BPMNEditorCompIcon } from "./v2/bpmn-editor-m.svg";
469479
export { ReactComponent as GeoMapChartsCompIcon } from "./v2/geomap-charts-m.svg";
470480
export { ReactComponent as GeoMapLayersCompIcon } from "./v2/geomap-layers-m.svg";

‎client/packages/lowcoder-design/src/icons/v2/line-chart-l.svg

Lines changed: 1264 additions & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/v2/line-chart-m.svg

Lines changed: 7 additions & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/v2/line-chart-s.svg

Lines changed: 7 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)