Skip to content

Q
quantum-blocks
Commit c47355b5 authored by 徐光星's avatar 徐光星
Browse files
Options

Merge branch 'feat/v1.6' into 'master' 

Feat/v1.6

See merge request !77
parents d1556b71 5d2721e3
Hide whitespace changes
Inline Side-by-side
Showing with 37208 additions and 337 deletions
app/web/page/editor/mixins/goodsTabs.mixin.ts
View file @ c47355b5
...@@ -63,8 +63,8 @@ export default class GoodsTabsMixin extends Vue { ...@@ -63,8 +63,8 @@ export default class GoodsTabsMixin extends Vue {
return pageData; return pageData;
} }
handleCouponIds() { handleCouponIds(data) {
const pageData = cloneDeep(this.pageData); const pageData = cloneDeep(data);
// 下方逻辑: 为一键领取优惠券统计页面所有优惠券组件所含优惠券批次id，并逗号分割，加入到一键领取组件的couponIds字段 // 下方逻辑: 为一键领取优惠券统计页面所有优惠券组件所含优惠券批次id，并逗号分割，加入到一键领取组件的couponIds字段
const { elements } = pageData; const { elements } = pageData;
let ids: any = []; let ids: any = [];
......
app/web/page/editor/view/dashboard/index.ts
View file @ c47355b5
...@@ -88,7 +88,7 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin, ...@@ -88,7 +88,7 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
let pageData = this.handleTabsRepaetCom(); let pageData = this.handleTabsRepaetCom();
pageData = this.handleComAchorScrollEnable(); pageData = this.handleComAchorScrollEnable();
pageData = this.handleGoodsTabs(); pageData = this.handleGoodsTabs();
pageData = this.handleCouponIds(); pageData = this.handleCouponIds(pageData);
const { pageName, pageDescribe, pageKeywords, coverImage, isPublish, isTemplate, shareCoverImage, shareOpenMethod, diversion } = pageConfig; const { pageName, pageDescribe, pageKeywords, coverImage, isPublish, isTemplate, shareCoverImage, shareOpenMethod, diversion } = pageConfig;
// ！diversion shareCoverImage shareOpenMethod没有作为单独的sql字段存储下来，只是单纯的存储到的redis中 // ！diversion shareCoverImage shareOpenMethod没有作为单独的sql字段存储下来，只是单纯的存储到的redis中
// 目前对此打了补丁，存放到page的props中 // 目前对此打了补丁，存放到page的props中
...@@ -101,8 +101,7 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin, ...@@ -101,8 +101,7 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
separateAllScheme(pageData.elements); separateAllScheme(pageData.elements);
const pageInfo = { diversion, page: JSON.stringify(pageData), author: user?.account, isPublish, pageName, pageDescribe, pageKeywords, coverImage, isTemplate, shareCoverImage, shareOpenMethod } as pageInfo; const pageInfo = { diversion, page: JSON.stringify(pageData), author: user?.account, isPublish, pageName, pageDescribe, pageKeywords, coverImage, isTemplate, shareCoverImage, shareOpenMethod } as pageInfo;
if (this.uuid) { pageInfo.uuid = this.uuid; } if (this.uuid) { pageInfo.uuid = this.uuid; }
const requestPageData = this.handleCouponIds(); await this.savePageData({ pageInfo, pageData: this.pageData });
await this.savePageData({ pageInfo, pageData: requestPageData });
if (this.uuid) { await this.getPageDate({ pageId: this.uuid }); } if (this.uuid) { await this.getPageDate({ pageId: this.uuid }); }
this.showSubmitPopup = false; this.showSubmitPopup = false;
// 清除新增数据时的缓存 // 清除新增数据时的缓存
......
app/web/service/utils.service.ts
View file @ c47355b5
...@@ -90,13 +90,13 @@ export const convertPointStyle = (point, defaultStyle, directionKey = DK) => { ...@@ -90,13 +90,13 @@ export const convertPointStyle = (point, defaultStyle, directionKey = DK) => {
}; };
export const isPx = str => /(\d+(\.\d*)?)+(px)/gi.test(str); export const isPx = str => /(\d+(\.\d*)?)+(px)/gi.test(str);
export const pxToRem = (str, width = 37.5) => { export const pxToRem = (str, width = 37.5) => {
const reg = /(\d+(\.\d*)?)+(px)/gi; //可以匹配浮点数 const reg = /(\d+(\.\d*)?)+(px)/gi; // 可以匹配浮点数
let newStr = str.replace(reg, function (_x) { const newStr = str.replace(reg, function(_x) {
_x = _x.replace(/px"/gi, ''); _x = _x.replace(/px"/gi, '');
return parseFloat(parseFloat(_x) / width).toFixed(2) + 'rem'; return parseFloat(parseFloat(_x) / width).toFixed(2) + 'rem';
}); });
return newStr; return newStr;
} };
export const getStyle = function(oElement, sName) { export const getStyle = function(oElement, sName) {
const result = oElement.currentStyle ? oElement.currentStyle[sName] : getComputedStyle(oElement, null)[sName]; const result = oElement.currentStyle ? oElement.currentStyle[sName] : getComputedStyle(oElement, null)[sName];
return result.includes('px') ? result.slice(0, -2) : result; return result.includes('px') ? result.slice(0, -2) : result;
......
package-lock.json
View file @ c47355b5
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment