Merge pull request alibaba#13 from twinkle77/hotfix-dataSource

alvarto · web-flow · commit 449d74228be7 · 2022-05-11T18:45:46.000+08:00
Hotfix data source
diff --git a/demo/public/index.html b/demo/public/index.html
@@ -29,9 +29,9 @@
     <!-- Fusion Next 的主包，低代码编辑器的依赖 -->
     <script src="https://g.alicdn.com/code/lib/alifd__next/1.23.24/next.min.js"></script>
     <!-- 低代码引擎的主包 -->
-    <script crossorigin="anonymous" src="https://alifd.alicdn.com/npm/@alilc/lowcode-engine@1.0.1-beta.1/dist/js/engine-core.js"></script>
+    <script crossorigin="anonymous" src="https://alifd.alicdn.com/npm/@alilc/lowcode-engine@1.0.6/dist/js/engine-core.js"></script>
     <!-- 低代码引擎官方扩展的主包 -->
-    <script crossorigin="anonymous" src="https://unpkg.alibaba-inc.com/@alilc/lowcode-engine-ext@1.0.4-beta.1/dist/js/engine-ext.js"></script>
+    <script crossorigin="anonymous" src="https://alifd.alicdn.com/npm/@alilc/lowcode-engine-ext@1.0.3/dist/js/engine-ext.js"></script>
   </head>
 
   <body>
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     ]
   },
   "scripts": {
+    "bootstrap": "lerna bootstrap",
     "dev": "npm run bootstrap && npm run build && cooking watch -c build/cooking.demo.js -p",
     "build": "./scripts/build.sh",
     "clean": "rm -rf ./packages/*/lib ./packages/*/es ./packages/*/dist ./packages/*/build",
diff --git a/packages/plugin-datasource-pane/src/classname-setter/index.tsx b/packages/plugin-datasource-pane/src/classname-setter/index.tsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Select } from '@alifd/next';
+import { common } from '@alilc/lowcode-engine';
 
 interface Color {
   rgb: any;
@@ -27,7 +28,7 @@ export default class ClassNameView extends PureComponent<PluginProps> {
 
   getClassNameList = () => {
     const { project } = this.context;
-    const schema = project.exportSchema();
+    const schema = project.exportSchema(common.designerCabin.TransformStage.Save);
     const { css } = schema.componentsTree[0];
     const classNameList = [];
     const re = /\.?\w+[^{]+\{[^}]*\}/g;
diff --git a/packages/plugin-datasource-pane/src/components/ClassNameView/ClassNameView.tsx b/packages/plugin-datasource-pane/src/components/ClassNameView/ClassNameView.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Select } from '@alifd/next';
-
+import { common } from '@alilc/lowcode-engine';
 
 export interface PluginProps {
     value: string;
@@ -30,7 +30,7 @@ export default class ClassNameView extends PureComponent<PluginProps, ClassNameV
 
     getClassNameList = () => {
         const { project } = this.context;
-        const schema = project.exportSchema();
+        const schema = project.exportSchema(common.designerCabin.TransformStage.Save);
         const { css } = schema.componentsTree[0];
         const classNameList: string[] = [];
         const re = /\.?\w+[^{]+\{[^}]*\}/g;
diff --git a/packages/plugin-datasource-pane/src/pane/index.tsx b/packages/plugin-datasource-pane/src/pane/index.tsx
@@ -24,6 +24,7 @@ import { isSchemaValid, correctSchema } from '../utils/schema';
 import { createStateService } from '../utils/stateMachine';
 import { DataSourcePaneContext } from '../utils/panel-context';
 import { mergeTwoObjectListByKey } from '../utils/misc';
+import { common } from '@alilc/lowcode-engine';
 
 import './index.scss';
 
@@ -119,7 +120,7 @@ export default class DataSourcePanePlugin extends PureComponent<
   handleSchemaChange = (schema: DataSource) => {
     const { project, onSchemaChange } = this.props;
     if (project) {
-      const docSchema = project.exportSchema();
+      const docSchema = project.exportSchema(common.designerCabin.TransformStage.Save);
       if (!_isEmpty(docSchema)) {
         _set(docSchema, 'componentsTree[0].dataSource', schema);
         project.importSchema(docSchema);
@@ -148,7 +149,7 @@ export default class DataSourcePanePlugin extends PureComponent<
 
     if (!active) return null;
 
-    const projectSchema = project.exportSchema() ?? {};
+    const projectSchema = project.exportSchema(common.designerCabin.TransformStage.Save) ?? {};
     let schema = defaultSchema;
     if (_isFunction(defaultSchema)) {
       schema = defaultSchema();

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`]`
`11`	`11`	`},`
`12`	`12`	`"scripts": {`
	`13`	`+ "bootstrap": "lerna bootstrap",`
`13`	`14`	`"dev": "npm run bootstrap && npm run build && cooking watch -c build/cooking.demo.js -p",`
`14`	`15`	`"build": "./scripts/build.sh",`
`15`	`16`	`"clean": "rm -rf ./packages//lib ./packages//es ./packages//dist ./packages//build",`