Merge pull request #356 from illa-family/develop

Develop

Author: AruSeito

apps/builder/package.json

@@ -28,8 +28,7 @@
     "acorn": "^8.7.1",
     "acorn-walk": "^8.2.0",
     "axios": "^0.26.1",
-    "chart.js": "^3.7.1",
-    "chartjs-plugin-datalabels": "^2.0.0",
+    "chart.js": "^3.9.1",
     "codemirror": "^5.65.5",
     "copy-to-clipboard": "^3.3.2",
     "dayjs": "^1.11.5",
@@ -41,7 +40,7 @@
     "lodash": "^4.17.21",
     "qs": "^6.11.0",
     "react": "^17.0.2",
-    "react-chartjs-2": "^4.1.0",
+    "react-chartjs-2": "^4.3.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^17.0.2",

apps/builder/src/assets/delete-dataset-icon.svg

@@ -36,7 +36,7 @@ import {
 import { clearMarks, lineMarker } from "@/components/CodeEditor/lintHelper"
 import { VALIDATION_TYPES } from "@/utils/validationFactory"
 
-export const CodeEditor: FC<CodeEditorProps> = (props) => {
+export const CodeEditor: FC<CodeEditorProps> = props => {
   const {
     className,
     mode = "TEXT_JS",
@@ -127,10 +127,10 @@ export const CodeEditor: FC<CodeEditorProps> = (props) => {
       const error = get(executionError, path)
       const result = get(executionResult, path)
       if (error) {
-        const evalError = error?.find((item) => {
+        const evalError = error?.find(item => {
           return item.errorType !== "LINT"
         })
-        const lintError = error?.find((item) => {
+        const lintError = error?.find(item => {
           return item.errorType === "LINT"
         })
         if (evalError) {
@@ -298,7 +298,7 @@ export const CodeEditor: FC<CodeEditorProps> = (props) => {
         content={<CodePreview preview={preview} />}
         showArrow={false}
         colorScheme="white"
-        onVisibleChange={(visible) => {
+        onVisibleChange={visible => {
           if (visible !== previewVisible && focus) {
             setPreviewVisible(true)
           }

apps/builder/src/components/CodeEditor/index.tsx

@@ -434,6 +434,7 @@
       "tab_title": "Inspect",
       "unselected_tip1": "No components selected.",
       "unselected_tip2": "Click on a component to select it.",
+      "multi_selected_header": "{{ number }} components selected",
       "header": {
         "action_menu": {
           "view_documentation": "View documentation",
@@ -546,7 +547,8 @@
         "config_type": "Config type",
         "data_source": "Data source",
         "chart_type": "Chart type",
-        "x_values": "X-axis Values",
+        "x_axis_value": "X-axis value",
+        "value_labels": "Value labels",
         "group_by": "Group by",
         "datasets": "Datasets",
         "dataset_config": "Dataset config",
@@ -559,12 +561,16 @@
         "dataset": {
           "name": "Dataset name",
           "value": "Dataset values",
-          "remove": "Remove dataset"
+          "remove": "Remove dataset",
+          "aggregation_method": "Aggregation method"
         },
         "new_tab": "New tab",
         "description": "Description",
         "duration": "Duration",
-        "data": "Data"
+        "data": "Data",
+        "chart_title": "Title",
+        "x_axis_name": "X-axis name",
+        "Y_axis_name": "Y-axis name"
       },
       "setter_tooltip": {
         "default_value": "The initial value of the input box. You can dynamically change the initial value of the input field by typing JavaScript in {{}}.",
@@ -634,6 +640,12 @@
           "blur": "Blur",
           "success": "Success",
           "fail": "Fail"
+        },
+        "chart_type": {
+          "bar": "Bar chart",
+          "line": "Line chart",
+          "scatterplot": "Scatterplot",
+          "pie": "Pie chart"
         }
       }
     },

apps/builder/src/i18n/locale/en-US.json

@@ -433,6 +433,7 @@
       "tab_title": "属性",
       "unselected_tip1": "没有组件被选中。",
       "unselected_tip2": "请点击组件以选中。",
+      "multi_selected_header": "已选中 {{ number }} 个组件",
       "header": {
         "action_menu": {
           "view_documentation": "View documentation",
@@ -545,7 +546,8 @@
         "config_type": "配置类型",
         "data_source": "数据源",
         "chart_type": "图表类型",
-        "x_values": "X轴值",
+        "x_axis_value": "X 轴",
+        "value_labels": "维度",
         "group_by": "分组标签",
         "datasets": "数据集",
         "dataset_config": "数据集配置",
@@ -557,13 +559,17 @@
         "only_run_when": "先决条件",
         "dataset": {
           "name": "数据集名称",
-          "value": "数据集数据",
-          "remove": "移除数据集"
+          "value": "数据列",
+          "remove": "移除数据集",
+          "aggregation_method": "聚合方式"
         },
         "new_tab": "在新标签中打开",
         "description": "描述",
         "duration": "持续时间",
-        "data": "数据"
+        "data": "数据",
+        "chart_title": "标题",
+        "x_axis_name": "横坐标名称",
+        "y_axis_name": "纵坐标名称"
       },
       "setter_tooltip": {
         "default_value": "输入框的默认值。您可以使用模版语法在框中输入JavaScript语句动态改变输入框的默认值。",
@@ -633,6 +639,12 @@
           "blur": "失焦",
           "success": "成功后",
           "fail": "失败后"
+        },
+        "chart_type": {
+          "bar": "柱状图",
+          "line": "折线图",
+          "scatterplot": "散点图",
+          "pie": "饼图"
         }
       }
     },

apps/builder/src/i18n/locale/zh-CN.json

@@ -15,6 +15,7 @@ import {
   UpdateComponentReflowPayload,
   UpdateComponentDisplayNamePayload,
   ComponentNode,
+  CopyComponentPayload,
 } from "@/redux/currentApp/editor/components/componentsState"
 import { UpdateComponentsShapePayload } from "@/redux/currentApp/editor/components/componentsPayload"
 
@@ -59,6 +60,23 @@ export const reduxAsync: Redux.Middleware = store => next => action => {
               ),
             )
             break
+          case "copyComponentReducer":
+            const copyComponentPayload = (payload as CopyComponentPayload[]).map(
+              copyShape => copyShape.newComponentNode,
+            )
+            Connection.getRoom("app", currentAppID)?.send(
+              getPayload(
+                Signal.SIGNAL_CREATE_STATE,
+                Target.TARGET_COMPONENTS,
+                true,
+                {
+                  type,
+                  payload,
+                },
+                copyComponentPayload,
+              ),
+            )
+            break
           case "updateComponentsShape":
             const singleComponentPayload: UpdateComponentsShapePayload = payload
             const singleComponentWSPayload = transformComponentReduxPayloadToWsPayload(