Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed bug #191 多数据循环图片宽高问题，完善多数据调用方法 #199

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixed bug #191 多数据循环图片宽高问题，完善多数据调用方法 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dce7c4
fixed bug #191 多数据循环时图片没有更新宽高的问题。
yadewe Jan 24, 2018
a4b9752
修改多数据循环调用方法，
yadewe Jan 24, 2018
0d22767
Merge branch 'master' of https://github.com/yadewe/wxParse
yadewe Jan 24, 2018
96edb49
删除调试信息
yadewe Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pages/index/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ Page({
</div>`;
var replyHtml1 = `<div style="margin-top:10px;height:50px;">
<p class="reply">
wxParse回复1:不错，喜欢[03][04]
wxParse回复1:不错，喜欢[03][04]<img src="../../image/icon_API.png"/>
</p>
</div>`;
var replyHtml2 = `<div style="margin-top:10px;height:50px;">
<p class="reply">
wxParse回复2:不错，喜欢[05][07]
wxParse回复2:不错，喜欢[05][07]<img src="../../image/icon_API_HL.png"/>
</p>
</div>`;
var replyHtml3 = `<div style="margin-top:10px;height:50px;">
Expand Down Expand Up @@ -193,10 +193,7 @@ Page({


for (let i = 0; i < replyArr.length; i++) {
WxParse.wxParse('reply' + i, 'html', replyArr[i], that);
if (i === replyArr.length - 1) {
WxParse.wxParseTemArray("replyTemArray",'reply', replyArr.length, that)
}
WxParse.wxParse('replyTemArray.' + i, 'html', replyArr[i], that);
}
}

Expand Down
2 changes: 1 addition & 1 deletion pages/index/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

<view style="padding: 20px 10px; background-color:#eee;">
<block wx:for="{{replyTemArray}}" wx:key="">
回复{{index}}:<template is="wxParse" data="{{wxParseData:item}}"/>
回复{{index}}:<template is="wxParse" data="{{wxParseData:item.nodes}}"/>
</block>
</view>
4 changes: 2 additions & 2 deletions wxParse/html2json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ function html2json(html, bindName) {
var name = attr.name;
var value = attr.value;
if (name == 'class') {
console.dir(value);
// console.dir(value);
// value = value.join("")
node.classStr = value;
}
// has multi attibutes
// make it array of attribute
if (name == 'style') {
console.dir(value);
// console.dir(value);
// value = value.join("")
node.styleStr = value;
}
Expand Down
31 changes: 28 additions & 3 deletions wxParse/wxParse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function wxParse(bindName = 'wxParseData', type='html', data='<div class="color:
var transData = {};//存放转化后的数据
if (type == 'html') {
transData = HtmlToJson.html2json(data, bindName);
console.log(JSON.stringify(transData, ' ', ' '));
// console.log(JSON.stringify(transData, ' ', ' '));
} else if (type == 'md' || type == 'markdown') {
var converter = new showdown.Converter();
var html = converter.makeHtml(data);
Expand Down Expand Up @@ -77,7 +77,7 @@ function wxParseImgLoad(e) {
}
// 假循环获取计算图片视觉最佳宽高
function calMoreImageInfo(e, idx, that, bindName) {
var temData = that.data[bindName];
var temData = getData(bindName,that.data);
if (!temData || temData.images.length == 0) {
return;
}
Expand Down Expand Up @@ -107,7 +107,7 @@ function wxAutoImageCal(originalWidth, originalHeight,that,bindName) {
var windowWidth = 0, windowHeight = 0;
var autoWidth = 0, autoHeight = 0;
var results = {};
var padding = that.data[bindName].view.imagePadding;
var padding = getData(bindName,that.data).view.imagePadding;
windowWidth = realWindowWidth-2*padding;
windowHeight = realWindowHeight;
//判断按照那种方式进行缩放
Expand Down Expand Up @@ -141,6 +141,31 @@ function wxParseTemArray(temArrayName,bindNameReg,total,that){
that.setData(obj);
}

// 获取对象实例的属性值，支持多级用“.”隔开
function getData(key, obj) {
if (!obj)
console.error('obj is invalid:', obj);
var ka = key.split(/\./);
var key1 = ka.shift();

// 为了兼容旧的写法（xxxxx[x]）添加以下转换
var arrayNameReg = /^([a-zA-Z0-9_-]+)\[([0-9]+)\]$/;
if (arrayNameReg.test(key1)){
var nameValues = key1.match(arrayNameReg)
key1 = nameValues[1]
var index = nameValues[2]
ka.unshift(index)
}
// 兼容写法结束

if (ka.length < 1) {
return obj[key1];
} else {
obj = obj[key1];
return getData(ka.join("."), obj);
}
}

/**
* 配置emojis
*
Expand Down