ソースを参照

修改发布地址

liwei 1 年間 前
コミット
3b60168e2f

+ 1 - 1
scripts/deployAssetsToOss.js

@@ -4,7 +4,7 @@ const co = require('co');
 const path = require('path');
 const fs = require('fs');
 
-const cdnpath = `/queenshow/`;
+const cdnpath = `/queenshowv1/`;
 const client = new OSS({
     region: 'oss-cn-chengdu',
     accessKeyId: 'LTAI4GHqGdgY3b14jVRTzL2w',

+ 1 - 1
scripts/deployHtmlToServer.js

@@ -23,7 +23,7 @@ fs.writeFileSync(nativePath + path.sep + 'share.html', shareHtml);
 // var consoleHtml = fs.readFileSync('dist/console.html');
 // fs.writeFileSync(nativePath + path.sep + 'console.html', consoleHtml);
 
-var serverPath = `/var/www/html/projects/queenshow`;
+var serverPath = `/var/www/html/projects/queenshowv1`;
 
 var ftpUtils = new sftp({
     remotePath: serverPath,

+ 1 - 2
src/controllers/natsController.ts

@@ -14,12 +14,11 @@ export class BusController {
 
   async init(host?: string) {
     const wsHost = host ? host : this.getQuery("host");
-    if (this._startInit || !wsHost ) return;
+    if (this._startInit || !wsHost || wsHost == "null") return;
     this._startInit = true;
   
     queenApi.showLoading("服务连接中...");
    
-    
     console.log("ws host=>", wsHost)
 
     

+ 1 - 1
src/modules/editor/components/Viewport/Header/ShareBox.tsx

@@ -11,7 +11,7 @@ export const ShareBox = defineComponent({
     if (location.host == "www.infish.cn") {
       shareLink =
         location.origin +
-        "/projects/queenshow/share.html?id=" +
+        "/projects/queenshowv1/share.html?id=" +
         store.designData._id;
     }
 

+ 1 - 1
src/modules/editor/module/index.ts

@@ -59,7 +59,7 @@ export class EditorModule extends ModuleRoot {
     const host = _params.get("host");
     let link = `${location.origin}/index.html?host=${host}${route}`;
     if (location.host == "www.infish.cn") {
-      link = `${location.origin}/projects/queenshow/index.html?host=${host}${route}`;
+      link = `${location.origin}/projects/queenshowv1/index.html?host=${host}${route}`;
     }
     location.href = link;
   }

+ 2 - 13
src/modules/editor/objects/DesignTemp/creates/createCompStyle.ts

@@ -61,19 +61,8 @@ export function createCompStyle(module: EditorModule, layout: Layout) {
     style.transformOrigin = "0 0";
 
   } else {
-    //转换成matrix形式
-    const m = new Matrix();
-    const transform = layout.transform;
-    if (transform) {
-      m.translate(transform.x || 0, transform.y || 0);
-      if (transform.s != undefined) {
-        m.scale(transform.s, transform.s);
-      }
-      if (transform.r != undefined) {
-        m.rotateDeg(transform.r);
-      }
-      style.transform = m.getMatrixStr();
-    }
+    const v = parseTransform(transform)
+    if (v) style.transform = v;
   }
   
 

+ 3 - 1
src/modules/editor/objects/DesignTemp/versions/1.0.0.ts

@@ -8,6 +8,8 @@ export function dataTransform(data: any) {
     return data;
   }
   data.version = "1.0.0";
+  debugger;
+
   if (!data.compMap) {
     data.compMap = {
         root: CompUI.Page.createComp({
@@ -25,7 +27,7 @@ export function dataTransform(data: any) {
           default: []
         },
         layout: {
-            size: [750, 700],
+            size: [750, 200],
             background: {
               color: "#ffffff",
             },

+ 1 - 1
src/modules/resource/actions/material.ts

@@ -40,7 +40,7 @@ export const materialActions = ResourceModule.action({
     const host = _params.get("host");
 
     if (location.host == "www.infish.cn") {
-      const url = `${location.origin}/projects/queenshow/index.html?host=${host}#/create/${record._id}`;
+      const url = `${location.origin}/projects/queenshowv1/index.html?host=${host}#/create/${record._id}`;
       location.href = url;
       return;
     }

+ 2 - 2
src/modules/resource/actions/promotion.tsx

@@ -30,7 +30,7 @@ export const promotionAction = ResourceModule.action({
     const res = await this.https.createPromotion({ title });
     console.log(location.host, location.host == "www.infish.cn");
     if (location.host == "www.infish.cn") {
-      const url = `${location.origin}/projects/queenshow/editor.html#/?id=${res.result}`;
+      const url = `${location.origin}/projects/queenshowv1/editor.html#/?id=${res.result}`;
       location.href = url;
       return;
     }
@@ -47,7 +47,7 @@ export const promotionAction = ResourceModule.action({
     const res = await this.https.createComp({ title });
     console.log(location.host, location.host == "www.infish.cn");
     if (location.host == "www.infish.cn") {
-      const url = `${location.origin}/projects/queenshow/editor.html#/?id=${res.result}&mode=editComp`;
+      const url = `${location.origin}/projects/queenshowv1/editor.html#/?id=${res.result}&mode=editComp`;
       location.href = url;
       return;
     }

+ 1 - 1
src/modules/resource/controllers/ComponentController.ts

@@ -13,7 +13,7 @@ export class ComponentController {
     const host = _params.get("host");
 
     if (location.host == "www.infish.cn") {
-      const url = `${location.origin}/projects/queenshow/editor.html?host=${host}#/?id=${item._id}&mode=editComp`;
+      const url = `${location.origin}/projects/queenshowv1/editor.html?host=${host}#/?id=${item._id}&mode=editComp`;
       location.href = url;
       return;
     }

+ 2 - 2
src/modules/resource/controllers/PromotionController.ts

@@ -13,7 +13,7 @@ export class PromotionController {
     const host = _params.get("host");
 
     if (location.host == "www.infish.cn") {
-      const url = `${location.origin}/projects/queenshow/editor.html?host=${host}#/?id=${item._id}`;
+      const url = `${location.origin}/projects/queenshowv1/editor.html?host=${host}#/?id=${item._id}`;
       location.href = url;
       return;
     }
@@ -23,7 +23,7 @@ export class PromotionController {
   }
   onPreview(item: any) {
     if (location.host == "www.infish.cn") {
-      const url = `${location.origin}/projects/queenshow/share.html#/?id=${item._id}`;
+      const url = `${location.origin}/projects/queenshowv1/share.html#/?id=${item._id}`;
       location.href = url;
       return;
     }

+ 1 - 1
src/pages/website/Promotion2/components/PromotionItem.tsx

@@ -15,7 +15,7 @@ import { any } from "vue-types";
 //     let shareLink = location.origin + "/share.html?id=" + props.id;
 //     if (location.host == "www.infish.cn") {
 //       shareLink =
-//         location.origin + "/projects/queenshow/share.html?id=" + props.id;
+//         location.origin + "/projects/queenshowv1/share.html?id=" + props.id;
 //     }
 
 //     const qrUrl = useQRCode(shareLink);

+ 1 - 1
src/pages/website/Promotion2/components/ShareModal.tsx

@@ -18,7 +18,7 @@ export default defineComponent({
     if (location.host == "www.infish.cn") {
       shareLink =
         location.origin +
-        "/projects/queenshow/share.html?id=" +
+        "/projects/queenshowv1/share.html?id=" +
         props.record._id;
     }
 

+ 1 - 1
vue.config.js

@@ -9,7 +9,7 @@ const { styles } = require("@ckeditor/ckeditor5-dev-utils");
 
 const publicPath =
   process.env.NODE_ENV === "production"
-    ? `//infishwaibao.oss-cn-chengdu.aliyuncs.com/queenshow/`
+    ? `//infishwaibao.oss-cn-chengdu.aliyuncs.com/queenshowv1/`
     : "./";
 // const publicPath = "./";