Merge pull request #124 from mokinzhao/master

fix: ui error

packages/editor/package-lock.json

@@ -13,6 +13,24 @@
         "lodash.throttle": "^4.1.1"
       }
     },
+    "@alex_xu/react-slider-vertify": {
+      "version": "1.1.8",
+      "resolved": "http://npm.yonghui.cn/repository/npm-group/@alex_xu/react-slider-vertify/-/react-slider-vertify-1.1.8.tgz",
+      "integrity": "sha1-s/mp+M7aUgWE89QKVQn+bTFyJ9U=",
+      "requires": {
+        "@babel/runtime": "^7.15.4"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "http://npm.yonghui.cn/repository/npm-group/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha1-/RfRa/34eObdAtGXU6OfqKjZyEo=",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
+      }
+    },
     "@ant-design/colors": {
       "version": "5.0.1",
       "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-5.0.1.tgz?cache=0&sync_timestamp=1607912367498&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-5.0.1.tgz",

packages/editor/package.json

@@ -87,7 +87,8 @@
     "xlsx": "^0.16.7",
     "yh-react-popover": "^0.3.0",
     "yorkie": "^2.0.0",
-    "zarm": "^2.5.1"
+    "zarm": "^2.5.1",
+    "@alex_xu/react-slider-vertify": "^1.1.7"
   },
   "license": "GPL-3.0",
   "devDependencies": {

packages/editor/src/pages/editor/Container.tsx

@@ -14,16 +14,7 @@ import SourceBox from './TargetBox';
 import TargetBox from './SourceBox';
 import Calibration from 'components/Calibration';
 import { FormRender } from '@/core';
-<<<<<<< Updated upstream:src/pages/editor/Container.tsx
-
-import template from '@/materials/base/template';
-import mediaTpl from '@/materials/media/template';
-import graphTpl from '@/materials/visual/template';
-
-import schemaH5 from '@/materials/schema';
-=======
 import dooringCompt from 'dooringUI/components';
->>>>>>> Stashed changes:packages/editor/src/pages/editor/Container.tsx
 import { ActionCreators, StateWithHistory } from 'redux-undo';
 import { throttle, detectMobileBrowser, getBrowserNavigatorMetaInfo } from '@/utils/tool';
 import styles from './index.less';
@@ -157,12 +148,9 @@ const Container = (props: {
     graphTpl.forEach((v: { type: string }) => {
       arr.push(v.type);
     });
-<<<<<<< Updated upstream:src/pages/editor/Container.tsx
-=======
     shopTpl.forEach((v: { type: string }) => {
       arr.push(v.type);
     });
->>>>>>> Stashed changes:packages/editor/src/pages/editor/Container.tsx
     return arr;
   }, [graphTpl, mediaTpl, template]);
 
@@ -265,8 +253,6 @@ const Container = (props: {
               ),
             )}
           </TabPane>
-<<<<<<< Updated upstream:src/pages/editor/Container.tsx
-=======
           <TabPane tab={generateHeader('shop', '')} key="4">
             <div className={styles.ctitle}>营销组件</div>
             {shopTpl.map(
@@ -284,7 +270,6 @@ const Container = (props: {
               ),
             )}
           </TabPane>
->>>>>>> Stashed changes:packages/editor/src/pages/editor/Container.tsx
         </>
       );
     }

packages/ui/src/pages/preview/index.tsx

@@ -58,11 +58,7 @@ const PreviewPage = memo((props: PreviewPageProps) => {
           document.title = pageConfig.title || 'H5-Dooring | 强大的H5编辑神器';
           // 设置数据源
           setPointData(
-<<<<<<< Updated upstream:src/pages/editor/preview.tsx
-            tpl.map((item: any) => ({
-=======
             tpl.map((item: { point: Record<string, unknown> }) => ({
->>>>>>> Stashed changes:packages/ui/src/pages/preview/index.tsx
               ...item,
               point: { ...item.point, isDraggable: false, isResizable: false },
             })),

packages/ui/src/ui-component/common.ts

@@ -1,10 +1,4 @@
-<<<<<<< Updated upstream:src/materials/common.ts
-import { INumberConfigType, TNumberDefaultType } from '@/components/FormComponents/types';
-
-///提取所有公用设置，传来时加到这里，约定公用类型
-=======
 //提取所有公用设置，传来时加到这里，约定公用类型
->>>>>>> Stashed changes:packages/ui/src/ui-component/common.ts
 //公用配置需满足条件，所有组件初始值统一，否则不放公用设置
 type TNumberDefaultType = number | string;
 type INumberConfigType = Record<string, unknown>;

packages/ui/src/ui-component/schema.ts

@@ -1,13 +1,13 @@
 import BasicSchema from './base/schema';
 import MediaSchema from './media/schema';
 import VisualSchema from './visual/schema';
-import shopSchema from './ShopComponents/schema';
+import ShopSchema from './shop/schema';
 
 const schema = {
   ...BasicSchema,
   ...MediaSchema,
   ...VisualSchema,
-  ...shopSchema,
+  ...ShopSchema,
 };
 
 export default schema;