diff --git a/components/qf-image-cropper/qf-image-cropper.render.js b/components/qf-image-cropper/qf-image-cropper.render.js
new file mode 100644
index 0000000..becac19
--- /dev/null
+++ b/components/qf-image-cropper/qf-image-cropper.render.js
@@ -0,0 +1,855 @@
+/**
+ * 图片编辑器-手势监听
+ * 1. 支持编译到app-vue(uni-app 2.5.5及以上版本)、H5上
+ */
+/** 图片偏移量 */
+var offset = { x: 0, y: 0 };
+/** 图片缩放比例 */
+var scale = 1;
+/** 图片最小缩放比例 */
+var minScale = 1;
+/** 图片旋转角度 */
+var rotate = 0;
+/** 触摸点 */
+var touches = [];
+/** 图片布局信息 */
+var img = {};
+/** 系统信息 */
+var sys = {};
+/** 裁剪区域布局信息 */
+var area = {};
+/** 触摸行为类型 */
+var touchType = '';
+/** 操作角的位置 */
+var activeAngle = 0;
+/** 裁剪区域布局信息偏移量 */
+var areaOffset = { left: 0, right: 0, top: 0, bottom: 0 };
+/** 元素ID */
+var elIds = {
+ 'imageStyles': 'crop-image',
+ 'maskStylesList': 'crop-mask-block',
+ 'borderStyles': 'crop-border',
+ 'circleBoxStyles': 'crop-circle-box',
+ 'circleStyles': 'crop-circle',
+ 'gridStylesList': 'crop-grid',
+ 'angleStylesList': 'crop-angle',
+}
+/** 记录上次初始化时间戳,排除APP重复更新 */
+var timestamp = 0;
+/** vue3 renderjs 条件编译无效,以此方式区别 APP 和 H5 */
+// #ifdef H5
+var platform = 'H5';
+// #endif
+// #ifdef APP
+var platform = 'APP';
+// #endif
+/** 容错值 */
+var fault = 0.000001;
+/**
+ * 获取a、b两数中的最小正数
+ * @param a
+ * @param b
+ */
+function minimum(a, b) {
+ if (a > 0 && b < 0) return a;
+ if (a < 0 && b > 0) return b;
+ if (a > 0 && b > 0) return Math.min(a, b);
+ return 0;
+}
+/**
+ * 在容错访问内获取n近似值
+ * @param n
+ */
+function num(n) {
+ var m = parseFloat((n).toFixed(6));
+ return m === fault || m === -fault ? 0 : m;
+}
+/**
+ * 比较a值在容错值范围内是否等于b值
+ * @param a
+ * @param b
+ */
+function equalsByFault(a, b) {
+ return Math.abs(a - b) <= fault;
+}
+/**
+ * 比较a值在容错值范围内是否小于b值
+ * @param a
+ * @param b
+ */
+function lessThanByFault(a, b) {
+ var c = a - b;
+ return c < 0 ? c < -fault : c < fault;
+}
+/**
+ * 验证并获取有效最大值
+ * @param v
+ * @param max
+ * @param isInclude
+ * @param x
+ * @param y
+ * @param rate
+ * @returns
+ */
+function validMax(v, max, isInclude, x, y, rate) {
+ if(typeof max === 'number') {
+ if(isInclude && equalsByFault(max, y)) { // 宽高不等时,x轴用y轴值要做等比例转换
+ var n = num(max * rate);
+ if (n <= x) return n; // 转化后值在x轴最大值范围内
+ return x; // 转化后值超出x轴最大值范围则用最大值
+ }
+ return max;
+ }
+ return v;
+}
+/**
+ * 样式对象转字符串
+ * @param {Object} style 样式对象
+ */
+function styleToString(style) {
+ if(typeof style === 'string') return style;
+ var str = '';
+ for (let k in style) {
+ str += k + ':' + style[k] + ';';
+ }
+ return str;
+}
+/**
+ *
+ * @param {Object} instance 页面实例对象
+ * @param {Object} key 要修改样式的key
+ * @param {Object|Array} style 样式
+ */
+function setStyle(instance, key, style) {
+ // console.log('setStyle', instance, key, JSON.stringify(style))
+ // #ifdef APP-PLUS
+ if(platform === 'APP') {
+ if(Object.prototype.toString.call(style) === '[object Array]') {
+ for (var i = 0, len = style.length; i < len; i++) {
+ var el = window.document.getElementById(elIds[key] + '-' + (i + 1));
+ el && (el.style = styleToString(style[i]));
+ }
+ } else {
+ var el = window.document.getElementById(elIds[key]);
+ el && (el.style = styleToString(style));
+ }
+ }
+ // #endif
+ // #ifdef H5
+ if(platform === 'H5') instance[key] = style;
+ // #endif
+}
+/**
+ * 触发页面实例指定方法
+ * @param {Object} instance 页面实例对象
+ * @param {Object} name 方法名称
+ * @param {Object} obj 传递参数
+ */
+function callMethod(instance, name, obj) {
+ // #ifdef APP-PLUS
+ if(platform === 'APP') instance.callMethod(name, obj);
+ // #endif
+ // #ifdef H5
+ if(platform === 'H5') instance[name](obj);
+ // #endif
+}
+/**
+ * 计算两点间距
+ * @param {Object} touches 触摸点信息
+ */
+function getDistanceByTouches(touches) {
+ // 根据勾股定理求两点间距离
+ var a = touches[1].pageX - touches[0].pageX;
+ var b = touches[1].pageY - touches[0].pageY;
+ var c = Math.sqrt(Math.pow(a, 2) + Math.pow(b, 2));
+ // 求两点间的中点坐标
+ // 1. a、b可能为负值
+ // 2. 在求a、b时,如用touches[1]减touches[0],则求中点坐标也得用touches[1]减a/2、b/2
+ // 3. 同理,在求a、b时,也可用touches[0]减touches[1],则求中点坐标也得用touches[0]减a/2、b/2
+ var x = touches[1].pageX - a / 2;
+ var y = touches[1].pageY - b / 2;
+ return { c, x, y };
+};
+
+/**
+ * 修正取值
+ * @param {Object} a
+ * @param {Object} b
+ * @param {Object} c
+ * @param {Object} reverse 是否反向
+ */
+function correctValue(a, b, c, reverse) {
+ return num(reverse ? Math.max(Math.min(a, b), c) : Math.min(Math.max(a, b), c));
+}
+
+/**
+ * 旋转90°或270°时检查边界:限制 x、y 拖动范围,禁止滑出边界
+ * @param {Object} e 点坐标
+ * @param {Object} xReverse x是否反向
+ * @param {Object} yReverse y是否反向
+ */
+function checkRotateRange(e, xReverse, yReverse) {
+ var o = num((img.height - img.width) / 2); // 宽高差值一半
+ return {
+ x: correctValue(e.x, -img.height + o + area.width + area.left, area.left + o, xReverse),
+ y: correctValue(e.y, -img.width - o + area.height + area.top, area.top - o, yReverse)
+ };
+}
+
+/**
+ * 检查边界:限制 x、y 拖动范围,禁止滑出边界
+ * @param {Object} e 点坐标
+ */
+function checkRange(e) {
+ var r = rotate / 90 % 2;
+ if(r === 1) { // 因图片宽高可能不等,翻转 90° 或 270° 后图片宽高需反着计算,且左右和上下边界要根据差值做偏移
+ if (area.width === area.height) {
+ return checkRotateRange(e, img.height < area.height, img.width < area.width);
+ }
+ var isInclude = img.height < area.width && img.width < area.height; // 图片是否包含在裁剪区域内
+ if (img.width < area.height || img.height < area.width) {
+ if (area.width < area.height && img.width < img.height) {
+ return isInclude
+ ? checkRotateRange(e, area.width < area.height, area.width < area.height)
+ : checkRotateRange(e, false, true);
+ }
+ if (area.height < area.width && img.height < img.width) {
+ return isInclude
+ ? checkRotateRange(e, area.height < area.width, area.height < area.width)
+ : checkRotateRange(e, true, false);
+ }
+ }
+ if (img.height >= area.width && img.width >= area.height) {
+ return checkRotateRange(e, false, false);
+ }
+ if (isInclude) {
+ return area.height < area.width
+ ? checkRotateRange(e, true, true)
+ : checkRotateRange(e, area.width < area.height, area.width < area.height);
+ }
+ if (img.height < area.width && !img.width < area.height) {
+ return checkRotateRange(e, true, false);
+ }
+ if (!img.height < area.width && img.width < area.height) {
+ return checkRotateRange(e, false, true);
+ }
+ return checkRotateRange(e, img.height < area.height, img.width < area.width);
+ }
+ return {
+ x: correctValue(e.x, -img.width + area.width + area.left, area.left, img.width < area.width),
+ y: correctValue(e.y, -img.height + area.height + area.top, area.top, img.height < area.height)
+ }
+};
+/**
+ * 变更图片布局信息
+ * @param {Object} e 布局信息
+ */
+function changeImageRect(e) {
+ // console.log('changeImageRect', e)
+ offset.x += e.x || 0;
+ offset.y += e.y || 0;
+ if(e.check && area.checkRange) { // 检查边界
+ var point = checkRange(offset);
+ if(offset.x !== point.x || offset.y !== point.y) {
+ offset = point;
+ }
+ }
+
+ // 因频繁修改 width/height 会造成大量的内存消耗,改为scale
+ // e.instance.imageStyles = {
+ // width: img.width + 'px',
+ // height: img.height + 'px',
+ // transform: 'translate(' + (offset.x + ox) + 'px, ' + (offset.y + ox) + 'px) rotate(' + rotate +'deg)'
+ // };
+ var ox = (img.width - img.oldWidth) / 2;
+ var oy = (img.height - img.oldHeight) / 2;
+ // e.instance.imageStyles = {
+ // width: img.oldWidth + 'px',
+ // height: img.oldHeight + 'px',
+ // transform: 'translate(' + (offset.x + ox) + 'px, ' + (offset.y + oy) + 'px) rotate(' + rotate +'deg) scale(' + scale + ')'
+ // };
+ setStyle(e.instance, 'imageStyles', {
+ width: img.oldWidth + 'px',
+ height: img.oldHeight + 'px',
+ transform: (img.gpu ? 'translateZ(0) ' : '') + 'translate(' + (offset.x + ox) + 'px, ' + (offset.y + oy) + 'px' + ') rotate(' + rotate +'deg) scale(' + scale + ')'
+ });
+ callMethod(e.instance, 'dataChange', {
+ width: img.width,
+ height: img.height,
+ x: offset.x,
+ y: offset.y,
+ rotate: rotate
+ });
+};
+/**
+ * 变更裁剪区域布局信息
+ * @param {Object} e 布局信息
+ */
+function changeAreaRect(e) {
+ // console.log('changeAreaRect', e)
+ // 变更蒙版样式
+ setStyle(e.instance, 'maskStylesList', [
+ {
+ left: 0,
+ width: (area.left + areaOffset.left) + 'px',
+ top: 0,
+ bottom: 0,
+ 'z-index': area.zIndex + 2
+ },
+ {
+ left: (area.right + areaOffset.right) + 'px',
+ right: 0,
+ top: 0,
+ bottom: 0,
+ 'z-index': area.zIndex + 2
+ },
+ {
+ left: (area.left + areaOffset.left) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ top: 0,
+ height: (area.top + areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 2
+ },
+ {
+ left: (area.left + areaOffset.left) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ top: (area.bottom + areaOffset.bottom) + 'px',
+ // height: (area.top - areaOffset.bottom + sys.offsetBottom) + 'px',
+ bottom: 0,
+ 'z-index': area.zIndex + 2
+ }
+ ]);
+ // 变更边框样式
+ if(area.showBorder) {
+ setStyle(e.instance, 'borderStyles', {
+ left: (area.left + areaOffset.left) + 'px',
+ top: (area.top + areaOffset.top) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 3
+ });
+ }
+
+ // 变更参考线样式
+ if(area.showGrid) {
+ setStyle(e.instance, 'gridStylesList', [
+ {
+ 'border-width': '1px 0 0 0',
+ left: (area.left + areaOffset.left) + 'px',
+ right: (area.right + areaOffset.right) + 'px',
+ top: (area.top + areaOffset.top + (area.height + areaOffset.bottom - areaOffset.top) / 3 - 0.5) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '1px 0 0 0',
+ left: (area.left + areaOffset.left) + 'px',
+ right: (area.right + areaOffset.right) + 'px',
+ top: (area.top + areaOffset.top + (area.height + areaOffset.bottom - areaOffset.top) * 2 / 3 - 0.5) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 1px 0 0',
+ top: (area.top + areaOffset.top) + 'px',
+ bottom: (area.bottom + areaOffset.bottom) + 'px',
+ left: (area.left + areaOffset.left + (area.width + areaOffset.right - areaOffset.left) / 3 - 0.5) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 1px 0 0',
+ top: (area.top + areaOffset.top) + 'px',
+ bottom: (area.bottom + areaOffset.bottom) + 'px',
+ left: (area.left + areaOffset.left + (area.width + areaOffset.right - areaOffset.left) * 2 / 3 - 0.5) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 3
+ }
+ ]);
+ }
+
+ // 变更四个伸缩角样式
+ if(area.showAngle) {
+ setStyle(e.instance, 'angleStylesList', [
+ {
+ 'border-width': area.angleBorderWidth + 'px 0 0 ' + area.angleBorderWidth + 'px',
+ left: (area.left + areaOffset.left - area.angleBorderWidth) + 'px',
+ top: (area.top + areaOffset.top - area.angleBorderWidth) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': area.angleBorderWidth + 'px ' + area.angleBorderWidth + 'px 0 0',
+ left: (area.right + areaOffset.right - area.angleSize) + 'px',
+ top: (area.top + areaOffset.top - area.angleBorderWidth) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 0 ' + area.angleBorderWidth + 'px ' + area.angleBorderWidth + 'px',
+ left: (area.left + areaOffset.left - area.angleBorderWidth) + 'px',
+ top: (area.bottom + areaOffset.bottom - area.angleSize) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 ' + area.angleBorderWidth + 'px ' + area.angleBorderWidth + 'px 0',
+ left: (area.right + areaOffset.right - area.angleSize) + 'px',
+ top: (area.bottom + areaOffset.bottom - area.angleSize) + 'px',
+ 'z-index': area.zIndex + 3
+ }
+ ]);
+ }
+
+ // 变更圆角样式
+ if(area.radius > 0) {
+ var radius = area.radius;
+ if(area.width === area.height && area.radius >= area.width / 2) { // 圆形
+ radius = (area.width / 2);
+ } else { // 圆角矩形
+ if(area.width !== area.height) { // 限制圆角半径不能超过短边的一半
+ radius = Math.min(area.width / 2, area.height / 2, radius);
+ }
+ }
+ setStyle(e.instance, 'circleBoxStyles', {
+ left: (area.left + areaOffset.left) + 'px',
+ top: (area.top + areaOffset.top) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 2
+ });
+ setStyle(e.instance, 'circleStyles', {
+ 'box-shadow': '0 0 0 ' + Math.max(area.width, area.height) + 'px rgba(51, 51, 51, 0.8)',
+ 'border-radius': radius + 'px'
+ });
+ }
+};
+/**
+ * 缩放图片
+ * @param {Object} e 布局信息
+ */
+function scaleImage(e) {
+ // console.log('scaleImage', e)
+ var last = scale;
+ scale = Math.min(Math.max(e.scale + scale, minScale), img.maxScale);
+ if(last !== scale) {
+ img.width = num(img.oldWidth * scale);
+ img.height = num(img.oldHeight * scale);
+ // 参考问题:有一个长4000px、宽4000px的四方形ABCD,A点的坐标固定在(-2000,-2000),
+ // 该四边形上有一个点E,坐标为(-100,-300),将该四方形复制一份并缩小到90%后,
+ // 新四边形的A点坐标为多少时可使新四边形的E点与原四边形的E点重合?
+ // 预期效果:从图中选取某点(参照物)为中心点进行缩放,缩放时无论图像怎么变化,该点位置始终固定不变
+ // 计算方法:以相同起点先计算缩放前后两点间的距离,再加上原图像偏移量即可
+ e.x = num((e.x - offset.x) * (1 - scale / last));
+ e.y = num((e.y - offset.y) * (1 - scale / last));
+ changeImageRect(e);
+ return true;
+ }
+ return false;
+};
+/**
+ * 获取触摸点在哪个角
+ * @param {number} x 触摸点x轴坐标
+ * @param {number} y 触摸点y轴坐标
+ * @return {number} 角的位置:0=无;1=左上;2=右上;3=左下;4=右下;
+ */
+function getToucheAngle(x, y) {
+ // console.log('getToucheAngle', x, y, JSON.stringify(area))
+ var o = area.angleBorderWidth; // 需扩大触发范围则把 o 值加大即可
+ var oy = sys.navigation ? 0 : sys.windowTop;
+ if(y >= area.top - o + oy && y <= area.top + area.angleSize + o + oy) {
+ if(x >= area.left - o && x <= area.left + area.angleSize + o) {
+ return 1; // 左上角
+ } else if(x >= area.right - area.angleSize - o && x <= area.right + o) {
+ return 2; // 右上角
+ }
+ } else if(y >= area.bottom - area.angleSize - o + oy && y <= area.bottom + o + oy) {
+ if(x >= area.left - o && x <= area.left + area.angleSize + o) {
+ return 3; // 左下角
+ } else if(x >= area.right - area.angleSize - o && x <= area.right + o) {
+ return 4; // 右下角
+ }
+ }
+ return 0; // 无触摸到角
+};
+/**
+ * 重置数据
+ */
+function resetData() {
+ offset = { x: 0, y: 0 };
+ scale = 1;
+ minScale = img.minScale;
+ rotate = 0;
+};
+function getTouchs(touches) {
+ var result = [];
+ var len = touches ? touches.length : 0
+ for (var i = 0; i < len; i++) {
+ result[i] = {
+ pageX: touches[i].pageX,
+ // h5无标题栏时,窗口顶部距离仍为标题栏高度,且触摸点y轴坐标还是有标题栏的值,即减去标题栏高度的值
+ pageY: touches[i].pageY + sys.windowTop
+ };
+ }
+ return result;
+};
+var mouseEvent = false;
+export default {
+ data() {
+ return {
+ imageStyles: {},
+ maskStylesList: [{}, {}, {}, {}],
+ borderStyles: {},
+ gridStylesList: [{}, {}, {}, {}],
+ angleStylesList: [{}, {}, {}, {}],
+ circleBoxStyles: {},
+ circleStyles: {}
+ }
+ },
+ created() {
+ // 监听 PC 端鼠标滚轮
+ // #ifdef H5
+ platform === 'H5' && window.addEventListener('mousewheel', async (e) => {
+ var touchs = getTouchs([e])
+ img.src && scaleImage({
+ instance: await this.getInstance(),
+ check: true,
+ // 鼠标向上滚动时,deltaY 固定 -100,鼠标向下滚动时,deltaY 固定 100
+ scale: e.deltaY > 0 ? -0.05 : 0.05,
+ x: touchs[0].pageX,
+ y: touchs[0].pageY
+ });
+ });
+ // #endif
+ },
+ // #ifdef H5
+ mounted() {
+ platform === 'H5' && this.initH5Events();
+ },
+ // #endif
+ setPlatform(p) {
+ platform = p;
+ },
+ methods: {
+ // #ifdef H5
+ getTouchEvent(e) {
+ e.touches = [
+ { pageX: e.pageX, pageY: e.pageY }
+ ];
+ return e;
+ },
+ initH5Events() {
+ const preview = document.getElementById('pic-preview');
+ preview?.addEventListener('mousedown', (e, ev) => {
+ mouseEvent = true;
+ this.touchstart(this.getTouchEvent(e));
+ });
+ preview?.addEventListener('mousemove', (e) => {
+ if (!mouseEvent) return;
+ this.touchmove(this.getTouchEvent(e));
+ });
+ preview?.addEventListener('mouseup', (e) => {
+ mouseEvent = false;
+ this.touchend(this.getTouchEvent(e))
+ });
+ preview?.addEventListener('mouseleave', (e) => {
+ mouseEvent = false;
+ this.touchend(this.getTouchEvent(e))
+ });
+ },
+ // #endif
+ async getInstance() {
+ // #ifdef APP-PLUS
+ if(platform === 'APP')
+ return this.$ownerInstance
+ ? Promise.resolve(this.$ownerInstance)
+ : new Promise((resolve) => {
+ setTimeout(async () => {
+ resolve(await this.getInstance());
+ });
+ });
+ // #endif
+ // #ifdef H5
+ if(platform === 'H5')
+ return Promise.resolve(this);
+ // #endif
+ },
+ /**
+ * 初始化:观察数据变更
+ * @param {Object} newVal 新数据
+ * @param {Object} oldVal 旧数据
+ * @param {Object} o 组件实例对象
+ */
+ initObserver: async function(newVal, oldVal, o, i) {
+ // console.log('initObserver', newVal, oldVal, o, i)
+ if(newVal && (!img.src || timestamp !== newVal.timestamp)) {
+ timestamp = newVal.timestamp;
+ img = newVal.img;
+ sys = newVal.sys;
+ area = newVal.area;
+ minScale = img.minScale;
+ resetData();
+ const instance = await this.getInstance()
+ img.src && changeImageRect({
+ instance,
+ x: (sys.windowWidth - img.width) / 2,
+ y: (sys.windowHeight + sys.windowTop - sys.offsetBottom - img.height) / 2
+ });
+ changeAreaRect({
+ instance
+ });
+ }
+ },
+ /**
+ * 鼠标滚轮滚动
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ mousewheel: function(e, o) {
+ // h5平台 wheel 事件无法判断滚轮滑动方向,需使用 mousewheel
+ },
+ /**
+ * 触摸开始
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ touchstart: function(e, o) {
+ if(!img.src) return;
+ touches = getTouchs(e.touches);
+ activeAngle = area.showAngle ? getToucheAngle(touches[0].pageX, touches[0].pageY) : 0;
+ if(touches.length === 1 && activeAngle !== 0) {
+ touchType = 'stretch'; // 伸缩裁剪区域
+ } else {
+ touchType = '';
+ }
+ // console.log('touchstart', e, activeAngle)
+ },
+ /**
+ * 触摸移动
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ touchmove: async function(e, o) {
+ if(!img.src) return;
+ // console.log('touchmove', e, o)
+ e.touches = getTouchs(e.touches);
+ if(touchType === 'stretch') { // 触摸四个角进行拉伸
+ var point = e.touches[0];
+ var start = touches[0];
+ var x = point.pageX - start.pageX;
+ var y = point.pageY - start.pageY;
+ if(x !== 0 || y !== 0) {
+ var maxX = num(area.width * (1 - area.minScale));
+ var maxY = num(area.height * (1 - area.minScale));
+ // console.log(x, y, maxX, maxY, offset, area)
+ touches[0] = point;
+ var r = rotate / 90 % 2;
+ var m = r === 1 ? num((img.height - img.width) / 2) : 0; // 宽高差值一半
+ var xCompare = r === 1 ? lessThanByFault(img.height, area.width) : lessThanByFault(img.width, area.width);
+ var yCompare = r === 1 ? lessThanByFault(img.width, area.height) : lessThanByFault(img.height, area.height)
+ var isInclude = xCompare && yCompare;
+ var isIntersect = area.checkRange && (xCompare || yCompare); // 图片是否包含在裁剪区域内
+ var isReverse = !isInclude || num((offset.x - area.left) / area.width) <= num((offset.y - area.top) / area.height) || (area.width > area.height && img.width < img.height && r === 1);
+ switch(activeAngle) {
+ case 1: // 左上角
+ x = num(x + areaOffset.left);
+ y = num(y + areaOffset.top);
+ if(x >= 0 && y >= 0) { // 有效滑动
+ var t = num(offset.y + m - area.top);
+ var l = num(offset.x - m - area.left);
+ // && (offset.x + img.width < area.right || offset.y + img.height < area.bottom)
+ var max = isIntersect && ((l >= 0) || (t >= 0))
+ ? minimum(t, l)
+ : false;
+ if(x > y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(x > maxX) x = maxX;
+ y = num(x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(y > maxY) y = maxY;
+ x = num(y * area.width / area.height);
+ }
+ areaOffset.left = x;
+ areaOffset.top = y;
+ }
+ break;
+ case 2: // 右上角
+ x = num(x + areaOffset.right);
+ y = num(y + areaOffset.top);
+ if(x <= 0 && y >= 0) { // 有效滑动
+ var w = (r === 1 ? img.height : img.width);
+ var t = num(offset.y + m - area.top);
+ var l = num(area.right + m - offset.x - w);
+ var max = isIntersect && ((t >= 0) || (l >= 0))
+ ? minimum(t, l)
+ : false;
+ if(-x > y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(-x > maxX) x = -maxX;
+ y = num(-x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(y > maxY) y = maxY;
+ x = num(-y * area.width / area.height);
+ }
+ areaOffset.right = x;
+ areaOffset.top = y;
+ }
+ break;
+ case 3: // 左下角
+ x += num(x + areaOffset.left);
+ y += num(y + areaOffset.bottom);
+ if(x >= 0 && y <= 0) { // 有效滑动
+ var w = (r === 1 ? img.width : img.height);
+ var t = num(area.bottom - m - offset.y - w);
+ var l = num(offset.x - m - area.left);
+ var max = isIntersect && ((l >= 0) || (t >= 0))
+ ? minimum(t, l)
+ : false;
+ if(x > -y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(x > maxX) x = maxX;
+ y = num(-x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(-y > maxY) y = -maxY;
+ x = num(-y * area.width / area.height);
+ }
+ areaOffset.left = x;
+ areaOffset.bottom = y;
+ }
+ break;
+ case 4: // 右下角
+ x = num(x + areaOffset.right);
+ y = num(y + areaOffset.bottom);
+ if(x <= 0 && y <= 0) { // 有效滑动
+ var w = (r === 1 ? img.height : img.width);
+ var h = (r === 1 ? img.width : img.height);
+ var t = num(area.bottom - offset.y - h - m);
+ var l = num(area.right + m - offset.x - w);
+ var max = isIntersect && ((l >= 0) || (t >= 0))
+ ? minimum(t, l)
+ : false;
+ if(-x > -y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(-x > maxX) x = -maxX;
+ y = num(x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(-y > maxY) y = -maxY;
+ x = num(y * area.width / area.height);
+ }
+ areaOffset.right = x;
+ areaOffset.bottom = y;
+ }
+ break;
+ }
+ // console.log(x, y, JSON.stringify(areaOffset))
+ changeAreaRect({
+ instance: await this.getInstance(),
+ });
+ // this.draw();
+ }
+ } else if (e.touches.length == 2) { // 双点触摸缩放
+ var start = getDistanceByTouches(touches);
+ var end = getDistanceByTouches(e.touches);
+ scaleImage({
+ instance: await this.getInstance(),
+ check: !area.bounce,
+ scale: (end.c - start.c) / 100,
+ x: end.x,
+ y: end.y
+ });
+ touchType = 'scale';
+ } else if(touchType === 'scale') {// 从双点触摸变成单点触摸 / 从缩放变成拖动
+ touchType = 'move';
+ } else {
+ changeImageRect({
+ instance: await this.getInstance(),
+ check: !area.bounce,
+ x: e.touches[0].pageX - touches[0].pageX,
+ y: e.touches[0].pageY - touches[0].pageY
+ });
+ touchType = 'move';
+ }
+ touches = e.touches;
+ },
+ /**
+ * 触摸结束
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ touchend: async function(e, o) {
+ if(!img.src) return;
+ if(touchType === 'stretch') { // 拉伸裁剪区域的四个角缩放
+ // 裁剪区域宽度被缩放到多少
+ var left = areaOffset.left;
+ var right = areaOffset.right;
+ var top = areaOffset.top;
+ var bottom = areaOffset.bottom;
+ var w = area.width + right - left;
+ var h = area.height + bottom - top;
+ // 图像放大倍数
+ var p = scale * (area.width / w) - scale;
+ // 复原裁剪区域
+ areaOffset = { left: 0, right: 0, top: 0, bottom: 0 };
+ changeAreaRect({
+ instance: await this.getInstance(),
+ });
+ scaleImage({
+ instance: await this.getInstance(),
+ scale: p,
+ x: area.left + left + (1 === activeAngle || 3 === activeAngle ? w : 0),
+ y: area.top + top + (1 === activeAngle || 2 === activeAngle ? h : 0)
+ });
+ } else if (area.bounce) { // 检查边界并矫正,实现拖动到边界时有回弹效果
+ changeImageRect({
+ instance: await this.getInstance(),
+ check: true
+ });
+ }
+ },
+ /**
+ * 顺时针翻转图片90°
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ rotateImage: async function(r) {
+ rotate = (rotate + (r || 90)) % 360;
+
+ if(img.minScale >= 1 && area.checkRange) {
+ // 因图片宽高可能不等,翻转后图片宽高需足够填满裁剪区域
+ minScale = 1;
+ if(img.width < area.height) {
+ minScale = area.height / img.oldWidth;
+ } else if(img.height < area.width) {
+ minScale = area.width / img.oldHeight;
+ }
+ if(minScale !== 1) {
+ scaleImage({
+ instance: await this.getInstance(),
+ scale: minScale - scale,
+ x: sys.windowWidth / 2,
+ y: (sys.windowHeight - sys.offsetBottom) / 2
+ });
+ }
+ }
+
+ // 由于拖动画布后会导致图片位置偏移,翻转时的旋转中心点需是图片区域+偏移区域的中心点
+ // 翻转x轴中心点 = (超出裁剪区域右侧的图片宽度 - 超出裁剪区域左侧的图片宽度) / 2
+ // 翻转y轴中心点 = (超出裁剪区域下方的图片宽度 - 超出裁剪区域上方的图片宽度) / 2
+ var ox = ((offset.x + img.width - area.right) - (area.left - offset.x)) / 2;
+ var oy = ((offset.y + img.height - area.bottom) - (area.top - offset.y)) / 2;
+ changeImageRect({
+ instance: await this.getInstance(),
+ check: true,
+ x: -ox - oy,
+ y: -oy + ox
+ });
+ },
+ rotateImage90: function() {
+ this.rotateImage(90)
+ },
+ rotateImage270: function() {
+ this.rotateImage(270)
+ },
+ }
+}
\ No newline at end of file
diff --git a/components/qf-image-cropper/qf-image-cropper.vue b/components/qf-image-cropper/qf-image-cropper.vue
new file mode 100644
index 0000000..0d2ac33
--- /dev/null
+++ b/components/qf-image-cropper/qf-image-cropper.vue
@@ -0,0 +1,746 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+ 重选
+
+
+ 选择图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/qf-image-cropper/qf-image-cropper.wxs b/components/qf-image-cropper/qf-image-cropper.wxs
new file mode 100644
index 0000000..98a5116
--- /dev/null
+++ b/components/qf-image-cropper/qf-image-cropper.wxs
@@ -0,0 +1,727 @@
+/**
+ * 图片编辑器-手势监听
+ * 1. wxs 暂不支持 es6 语法
+ * 2. 支持编译到微信小程序、QQ小程序、app-vue、H5上(uni-app 2.2.5及以上版本)
+ */
+/** 图片偏移量 */
+var offset = { x: 0, y: 0 };
+/** 图片缩放比例 */
+var scale = 1;
+/** 图片最小缩放比例 */
+var minScale = 1;
+/** 图片旋转角度 */
+var rotate = 0;
+/** 触摸点 */
+var touches = [];
+/** 图片布局信息 */
+var img = {};
+/** 系统信息 */
+var sys = {};
+/** 裁剪区域布局信息 */
+var area = {};
+/** 触摸行为类型 */
+var touchType = '';
+/** 操作角的位置 */
+var activeAngle = 0;
+/** 裁剪区域布局信息偏移量 */
+var areaOffset = { left: 0, right: 0, top: 0, bottom: 0 };
+/** 容错值 */
+var fault = 0.000001;
+/**
+ * 获取a、b两数中的最小正数
+ * @param a
+ * @param b
+ */
+function minimum(a, b) {
+ if (a > 0 && b < 0) return a;
+ if (a < 0 && b > 0) return b;
+ if (a > 0 && b > 0) return Math.min(a, b);
+ return 0;
+}
+/**
+ * 在容错访问内获取n近似值
+ * @param n
+ */
+function num(n) {
+ var m = parseFloat((n).toFixed(6));
+ return m === fault || m === -fault ? 0 : m;
+}
+/**
+ * 比较a值在容错值范围内是否等于b值
+ * @param a
+ * @param b
+ */
+function equalsByFault(a, b) {
+ return Math.abs(a - b) <= fault;
+}
+/**
+ * 比较a值在容错值范围内是否小于b值
+ * @param a
+ * @param b
+ */
+function lessThanByFault(a, b) {
+ var c = a - b;
+ return c < 0 ? c < -fault : c < fault;
+}
+/**
+ * 验证并获取有效最大值
+ * @param v
+ * @param max
+ * @param isInclude
+ * @param x
+ * @param y
+ * @param rate
+ * @returns
+ */
+function validMax(v, max, isInclude, x, y, rate) {
+ if(typeof max === 'number') {
+ if(isInclude && equalsByFault(max, y)) { // 宽高不等时,x轴用y轴值要做等比例转换
+ var n = num(max * rate);
+ if (n <= x) return n; // 转化后值在x轴最大值范围内
+ return x; // 转化后值超出x轴最大值范围则用最大值
+ }
+ return max;
+ }
+ return v;
+}
+/**
+ * 计算两点间距
+ * @param {Object} touches 触摸点信息
+ */
+function getDistanceByTouches(touches) {
+ // 根据勾股定理求两点间距离
+ var a = touches[1].pageX - touches[0].pageX;
+ var b = touches[1].pageY - touches[0].pageY;
+ var c = Math.sqrt(Math.pow(a, 2) + Math.pow(b, 2));
+ // 求两点间的中点坐标
+ // 1. a、b可能为负值
+ // 2. 在求a、b时,如用touches[1]减touches[0],则求中点坐标也得用touches[1]减a/2、b/2
+ // 3. 同理,在求a、b时,也可用touches[0]减touches[1],则求中点坐标也得用touches[0]减a/2、b/2
+ var x = touches[1].pageX - a / 2;
+ var y = touches[1].pageY - b / 2;
+ return { c, x, y };
+};
+/**
+ * 修正取值
+ * @param {Object} a
+ * @param {Object} b
+ * @param {Object} c
+ * @param {Object} reverse 是否反向
+ */
+function correctValue(a, b, c, reverse) {
+ return num(reverse ? Math.max(Math.min(a, b), c) : Math.min(Math.max(a, b), c));
+}
+
+/**
+ * 旋转90°或270°时检查边界:限制 x、y 拖动范围,禁止滑出边界
+ * @param {Object} e 点坐标
+ * @param {Object} xReverse x是否反向
+ * @param {Object} yReverse y是否反向
+ */
+function checkRotateRange(e, xReverse, yReverse) {
+ var o = num((img.height - img.width) / 2); // 宽高差值一半
+ return {
+ x: correctValue(e.x, -img.height + o + area.width + area.left, area.left + o, xReverse),
+ y: correctValue(e.y, -img.width - o + area.height + area.top, area.top - o, yReverse)
+ };
+}
+
+/**
+ * 检查边界:限制 x、y 拖动范围,禁止滑出边界
+ * @param {Object} e 点坐标
+ */
+function checkRange(e) {
+ var r = rotate / 90 % 2;
+ if(r === 1) { // 因图片宽高可能不等,翻转 90° 或 270° 后图片宽高需反着计算,且左右和上下边界要根据差值做偏移
+ if (area.width === area.height) {
+ return checkRotateRange(e, img.height < area.height, img.width < area.width);
+ }
+ var isInclude = img.height < area.width && img.width < area.height; // 图片是否包含在裁剪区域内
+ if (img.width < area.height || img.height < area.width) {
+ if (area.width < area.height && img.width < img.height) {
+ return isInclude
+ ? checkRotateRange(e, area.width < area.height, area.width < area.height)
+ : checkRotateRange(e, false, true);
+ }
+ if (area.height < area.width && img.height < img.width) {
+ return isInclude
+ ? checkRotateRange(e, area.height < area.width, area.height < area.width)
+ : checkRotateRange(e, true, false);
+ }
+ }
+ if (img.height >= area.width && img.width >= area.height) {
+ return checkRotateRange(e, false, false);
+ }
+ if (isInclude) {
+ return area.height < area.width
+ ? checkRotateRange(e, true, true)
+ : checkRotateRange(e, area.width < area.height, area.width < area.height);
+ }
+ if (img.height < area.width && !img.width < area.height) {
+ return checkRotateRange(e, true, false);
+ }
+ if (!img.height < area.width && img.width < area.height) {
+ return checkRotateRange(e, false, true);
+ }
+ return checkRotateRange(e, img.height < area.height, img.width < area.width);
+ }
+ return {
+ x: correctValue(e.x, -img.width + area.width + area.left, area.left, img.width < area.width),
+ y: correctValue(e.y, -img.height + area.height + area.top, area.top, img.height < area.height)
+ };
+};
+/**
+ * 变更图片布局信息
+ * @param {Object} e 布局信息
+ */
+function changeImageRect(e) {
+ offset.x += e.x || 0;
+ offset.y += e.y || 0;
+ var image = e.instance.selectComponent('.crop-image');
+ if(e.check && area.checkRange) { // 检查边界
+ var point = checkRange(offset);
+ if(offset.x !== point.x || offset.y !== point.y) {
+ offset = point;
+ }
+ }
+ // image.setStyle({
+ // width: img.width + 'px',
+ // height: img.height + 'px',
+ // transform: 'translate(' + offset.x + 'px, ' + offset.y + 'px) rotate(' + rotate +'deg)'
+ // });
+ var ox = (img.width - img.oldWidth) / 2;
+ var oy = (img.height - img.oldHeight) / 2;
+ image.setStyle({
+ width: img.oldWidth + 'px',
+ height: img.oldHeight + 'px',
+ transform: (img.gpu ? 'translateZ(0) ' : '') + 'translate(' + (offset.x + ox) + 'px, ' + (offset.y + oy) + 'px) rotate(' + rotate +'deg) scale(' + scale + ')'
+ });
+
+ e.instance.callMethod('dataChange', {
+ width: img.width,
+ height: img.height,
+ x: offset.x,
+ y: offset.y,
+ rotate: rotate
+ });
+};
+/**
+ * 变更裁剪区域布局信息
+ * @param {Object} e 布局信息
+ */
+function changeAreaRect(e) {
+ // 变更蒙版样式
+ var masks = e.instance.selectAllComponents('.crop-mask-block');
+ var maskStyles = [
+ {
+ left: 0,
+ width: (area.left + areaOffset.left) + 'px',
+ top: 0,
+ bottom: 0,
+ 'z-index': area.zIndex + 2
+ },
+ {
+ left: (area.right + areaOffset.right) + 'px',
+ right: 0,
+ top: 0,
+ bottom: 0,
+ 'z-index': area.zIndex + 2
+ },
+ {
+ left: (area.left + areaOffset.left) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ top: 0,
+ height: (area.top + areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 2
+ },
+ {
+ left: (area.left + areaOffset.left) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ top: (area.bottom + areaOffset.bottom) + 'px',
+ // height: (area.top - areaOffset.bottom + sys.offsetBottom) + 'px',
+ bottom: 0,
+ 'z-index': area.zIndex + 2
+ }
+ ];
+ var len = masks.length;
+ for (var i = 0; i < len; i++) {
+ masks[i].setStyle(maskStyles[i]);
+ }
+
+ // 变更边框样式
+ if(area.showBorder) {
+ var border = e.instance.selectComponent('.crop-border');
+ border.setStyle({
+ left: (area.left + areaOffset.left) + 'px',
+ top: (area.top + areaOffset.top) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 3
+ });
+ }
+
+ // 变更参考线样式
+ if(area.showGrid) {
+ var grids = e.instance.selectAllComponents('.crop-grid');
+ var gridStyles = [
+ {
+ 'border-width': '1px 0 0 0',
+ left: (area.left + areaOffset.left) + 'px',
+ right: (area.right + areaOffset.right) + 'px',
+ top: (area.top + areaOffset.top + (area.height + areaOffset.bottom - areaOffset.top) / 3 - 0.5) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '1px 0 0 0',
+ left: (area.left + areaOffset.left) + 'px',
+ right: (area.right + areaOffset.right) + 'px',
+ top: (area.top + areaOffset.top + (area.height + areaOffset.bottom - areaOffset.top) * 2 / 3 - 0.5) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 1px 0 0',
+ top: (area.top + areaOffset.top) + 'px',
+ bottom: (area.bottom + areaOffset.bottom) + 'px',
+ left: (area.left + areaOffset.left + (area.width + areaOffset.right - areaOffset.left) / 3 - 0.5) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 1px 0 0',
+ top: (area.top + areaOffset.top) + 'px',
+ bottom: (area.bottom + areaOffset.bottom) + 'px',
+ left: (area.left + areaOffset.left + (area.width + areaOffset.right - areaOffset.left) * 2 / 3 - 0.5) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 3
+ }
+ ];
+ var len = grids.length;
+ for (var i = 0; i < len; i++) {
+ grids[i].setStyle(gridStyles[i]);
+ }
+ }
+
+ // 变更四个伸缩角样式
+ if(area.showAngle) {
+ var angles = e.instance.selectAllComponents('.crop-angle');
+ var angleStyles = [
+ {
+ 'border-width': area.angleBorderWidth + 'px 0 0 ' + area.angleBorderWidth + 'px',
+ left: (area.left + areaOffset.left - area.angleBorderWidth) + 'px',
+ top: (area.top + areaOffset.top - area.angleBorderWidth) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': area.angleBorderWidth + 'px ' + area.angleBorderWidth + 'px 0 0',
+ left: (area.right + areaOffset.right - area.angleSize) + 'px',
+ top: (area.top + areaOffset.top - area.angleBorderWidth) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 0 ' + area.angleBorderWidth + 'px ' + area.angleBorderWidth + 'px',
+ left: (area.left + areaOffset.left - area.angleBorderWidth) + 'px',
+ top: (area.bottom + areaOffset.bottom - area.angleSize) + 'px',
+ 'z-index': area.zIndex + 3
+ },
+ {
+ 'border-width': '0 ' + area.angleBorderWidth + 'px ' + area.angleBorderWidth + 'px 0',
+ left: (area.right + areaOffset.right - area.angleSize) + 'px',
+ top: (area.bottom + areaOffset.bottom - area.angleSize) + 'px',
+ 'z-index': area.zIndex + 3
+ }
+ ];
+ var len = angles.length;
+ for (var i = 0; i < len; i++) {
+ angles[i].setStyle(angleStyles[i]);
+ }
+ }
+
+ // 变更圆角样式
+ if(area.radius > 0) {
+ var circleBox = e.instance.selectComponent('.crop-circle-box');
+ var circle = e.instance.selectComponent('.crop-circle');
+ var radius = area.radius;
+ if(area.width === area.height && area.radius >= area.width / 2) { // 圆形
+ radius = (area.width / 2);
+ } else { // 圆角矩形
+ if(area.width !== area.height) { // 限制圆角半径不能超过短边的一半
+ radius = Math.min(area.width / 2, area.height / 2, radius);
+ }
+ }
+ circleBox.setStyle({
+ left: (area.left + areaOffset.left) + 'px',
+ top: (area.top + areaOffset.top) + 'px',
+ width: (area.width + areaOffset.right - areaOffset.left) + 'px',
+ height: (area.height + areaOffset.bottom - areaOffset.top) + 'px',
+ 'z-index': area.zIndex + 2
+ });
+ circle.setStyle({
+ 'box-shadow': '0 0 0 ' + Math.max(area.width, area.height) + 'px rgba(51, 51, 51, 0.8)',
+ 'border-radius': radius + 'px'
+ });
+ }
+};
+/**
+ * 缩放图片
+ * @param {Object} e 布局信息
+ */
+function scaleImage(e) {
+ var last = scale;
+ scale = Math.min(Math.max(e.scale + scale, minScale), img.maxScale);
+ if(last !== scale) {
+ img.width = num(img.oldWidth * scale);
+ img.height = num(img.oldHeight * scale);
+ // 参考问题:有一个长4000px、宽4000px的四方形ABCD,A点的坐标固定在(-2000,-2000),
+ // 该四边形上有一个点E,坐标为(-100,-300),将该四方形复制一份并缩小到90%后,
+ // 新四边形的A点坐标为多少时可使新四边形的E点与原四边形的E点重合?
+ // 预期效果:从图中选取某点(参照物)为中心点进行缩放,缩放时无论图像怎么变化,该点位置始终固定不变
+ // 计算方法:以相同起点先计算缩放前后两点间的距离,再加上原图像偏移量即可
+ e.x = num((e.x - offset.x) * (1 - scale / last));
+ e.y = num((e.y - offset.y) * (1 - scale / last));
+ changeImageRect(e);
+ return true;
+ }
+ return false;
+};
+/**
+ * 获取触摸点在哪个角
+ * @param {number} x 触摸点x轴坐标
+ * @param {number} y 触摸点y轴坐标
+ * @return {number} 角的位置:0=无;1=左上;2=右上;3=左下;4=右下;
+ */
+function getToucheAngle(x, y) {
+ // console.log('getToucheAngle', x, y, JSON.stringify(area))
+ var o = area.angleBorderWidth; // 需扩大触发范围则把 o 值加大即可
+ if(y >= area.top - o && y <= area.top + area.angleSize + o) {
+ if(x >= area.left - o && x <= area.left + area.angleSize + o) {
+ return 1; // 左上角
+ } else if(x >= area.right - area.angleSize - o && x <= area.right + o) {
+ return 2; // 右上角
+ }
+ } else if(y >= area.bottom - area.angleSize - o && y <= area.bottom + o) {
+ if(x >= area.left - o && x <= area.left + area.angleSize + o) {
+ return 3; // 左下角
+ } else if(x >= area.right - area.angleSize - o && x <= area.right + o) {
+ return 4; // 右下角
+ }
+ }
+ return 0; // 无触摸到角
+};
+/**
+ * 重置数据
+ */
+function resetData() {
+ offset = { x: 0, y: 0 };
+ scale = 1;
+ minScale = img.minScale;
+ rotate = 0;
+};
+/**
+* 顺时针翻转图片90°
+* @param {Object} e 事件对象
+* @param {Object} o 组件实例对象
+*/
+function rotateImage(e, o, r) {
+ rotate = (rotate + r) % 360;
+ if(img.minScale >= 1 && area.checkRange) {
+ // 因图片宽高可能不等,翻转后图片宽高需足够填满裁剪区域
+ minScale = 1;
+ if(img.width < area.height) {
+ minScale = area.height / img.oldWidth;
+ } else if(img.height < area.width) {
+ minScale = area.width / img.oldHeight;
+ }
+ if(minScale !== 1) {
+ scaleImage({
+ instance: o,
+ scale: minScale - scale,
+ x: sys.windowWidth / 2,
+ y: (sys.windowHeight - sys.offsetBottom) / 2
+ });
+ }
+ }
+
+ // 由于拖动画布后会导致图片位置偏移,翻转时的旋转中心点需是图片区域+偏移区域的中心点
+ // 翻转x轴中心点 = (超出裁剪区域右侧的图片宽度 - 超出裁剪区域左侧的图片宽度) / 2
+ // 翻转y轴中心点 = (超出裁剪区域下方的图片宽度 - 超出裁剪区域上方的图片宽度) / 2
+ var ox = ((offset.x + img.width - area.right) - (area.left - offset.x)) / 2;
+ var oy = ((offset.y + img.height - area.bottom) - (area.top - offset.y)) / 2;
+ changeImageRect({
+ instance: o,
+ check: true,
+ x: -ox - oy,
+ y: -oy + ox
+ });
+};
+module.exports = {
+ /**
+ * 初始化:观察数据变更
+ * @param {Object} newVal 新数据
+ * @param {Object} oldVal 旧数据
+ * @param {Object} o 组件实例对象
+ */
+ initObserver: function(newVal, oldVal, o, i) {
+ if(newVal) {
+ img = newVal.img;
+ sys = newVal.sys;
+ area = newVal.area;
+ minScale = img.minScale;
+ resetData();
+ img.src && changeImageRect({
+ instance: o,
+ x: (sys.windowWidth - img.width) / 2,
+ y: (sys.windowHeight - sys.offsetBottom - img.height) / 2
+ });
+ changeAreaRect({
+ instance: o
+ });
+ // console.log('initRect', JSON.stringify(newVal))
+ }
+ },
+ /**
+ * 鼠标滚轮滚动
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ mousewheel: function(e, o) {
+ if(!img.src) return;
+ scaleImage({
+ instance: o,
+ check: true,
+ // 鼠标向上滚动时,deltaY 固定 -100,鼠标向下滚动时,deltaY 固定 100
+ scale: e.detail.deltaY > 0 ? -0.05 : 0.05,
+ x: e.touches[0].pageX,
+ y: e.touches[0].pageY
+ });
+ },
+ /**
+ * 触摸开始
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ touchstart: function(e, o) {
+ if(!img.src) return;
+ touches = e.touches;
+ activeAngle = area.showAngle ? getToucheAngle(touches[0].pageX, touches[0].pageY) : 0;
+ if(touches.length === 1 && activeAngle !== 0) {
+ touchType = 'stretch'; // 伸缩裁剪区域
+ } else {
+ touchType = '';
+ }
+ // console.log('touchstart', JSON.stringify(e), activeAngle)
+ },
+ /**
+ * 触摸移动
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ touchmove: function(e, o) {
+ if(!img.src) return;
+ // console.log('touchmove', JSON.stringify(e), JSON.stringify(o))
+ if(touchType === 'stretch') { // 触摸四个角进行拉伸
+ var point = e.touches[0];
+ var start = touches[0];
+ var x = point.pageX - start.pageX;
+ var y = point.pageY - start.pageY;
+ if(x !== 0 || y !== 0) {
+ var maxX = num(area.width * (1 - area.minScale));
+ var maxY = num(area.height * (1 - area.minScale));
+ // console.log(x, y, maxX, maxY, offset, area)
+ touches[0] = point;
+ var r = rotate / 90 % 2;
+ var m = r === 1 ? num((img.height - img.width) / 2) : 0; // 宽高差值一半
+ var xCompare = r === 1 ? lessThanByFault(img.height, area.width) : lessThanByFault(img.width, area.width);
+ var yCompare = r === 1 ? lessThanByFault(img.width, area.height) : lessThanByFault(img.height, area.height)
+ var isInclude = xCompare && yCompare;
+ var isIntersect = area.checkRange && (xCompare || yCompare); // 图片是否包含在裁剪区域内
+ var isReverse = !isInclude || num((offset.x - area.left) / area.width) <= num((offset.y - area.top) / area.height) || (area.width > area.height && img.width < img.height && r === 1);
+ switch(activeAngle) {
+ case 1: // 左上角
+ x = num(x + areaOffset.left);
+ y = num(y + areaOffset.top);
+ if(x >= 0 && y >= 0) { // 有效滑动
+ var t = num(offset.y + m - area.top);
+ var l = num(offset.x - m - area.left);
+ // && (offset.x + img.width < area.right || offset.y + img.height < area.bottom)
+ var max = isIntersect && ((l >= 0) || (t >= 0))
+ ? minimum(t, l)
+ : false;
+ if(x > y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(x > maxX) x = maxX;
+ y = num(x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(y > maxY) y = maxY;
+ x = num(y * area.width / area.height);
+ }
+ areaOffset.left = x;
+ areaOffset.top = y;
+ }
+ break;
+ case 2: // 右上角
+ x = num(x + areaOffset.right);
+ y = num(y + areaOffset.top);
+ if(x <= 0 && y >= 0) { // 有效滑动
+ var w = (r === 1 ? img.height : img.width);
+ var t = num(offset.y + m - area.top);
+ var l = num(area.right + m - offset.x - w);
+ var max = isIntersect && ((t >= 0) || (l >= 0))
+ ? minimum(t, l)
+ : false;
+ // var max = isInclude && ((offset.x > 0 && offset.x + img.width <= area.right) || (offset.y > 0 && offset.y >= area.top))
+ // ? minimum(offset.y - area.top, area.right - offset.x - img.width)
+ // : false;
+ // console.log(offset.x, offset.y, img.width, img.height, area.top, area.right, m, max)
+ // console.log(offset.y + m - area.top, area.right + m - offset.x - w)
+ if(-x > y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(-x > maxX) x = -maxX;
+ y = num(-x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(y > maxY) y = maxY;
+ x = num(-y * area.width / area.height);
+ }
+ areaOffset.right = x;
+ areaOffset.top = y;
+ }
+ break;
+ case 3: // 左下角
+ x += num(x + areaOffset.left);
+ y += num(y + areaOffset.bottom);
+ if(x >= 0 && y <= 0) { // 有效滑动
+ var w = (r === 1 ? img.width : img.height);
+ var t = num(area.bottom - m - offset.y - w);
+ var l = num(offset.x - m - area.left);
+ var max = isIntersect && ((l >= 0) || (t >= 0))
+ ? minimum(t, l)
+ : false;
+ if(x > -y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(x > maxX) x = maxX;
+ y = num(-x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(-y > maxY) y = -maxY;
+ x = num(-y * area.width / area.height);
+ }
+ areaOffset.left = x;
+ areaOffset.bottom = y;
+ }
+ break;
+ case 4: // 右下角
+ x = num(x + areaOffset.right);
+ y = num(y + areaOffset.bottom);
+ if(x <= 0 && y <= 0) { // 有效滑动
+ var w = (r === 1 ? img.height : img.width);
+ var h = (r === 1 ? img.width : img.height);
+ var t = num(area.bottom - offset.y - h - m);
+ var l = num(area.right + m - offset.x - w);
+ var max = isIntersect && ((l >= 0) || (t >= 0))
+ ? minimum(t, l)
+ : false;
+ if(-x > -y && isReverse) { // 以x轴滑动距离为缩放基准
+ maxX = validMax(maxX, max, isInclude, l, t, area.width / area.height);
+ if(-x > maxX) x = -maxX;
+ y = num(x * area.height / area.width);
+ } else { // 以y轴滑动距离为缩放基准
+ maxY = validMax(maxY, max, isInclude, t, l, area.height / area.width);
+ if(-y > maxY) y = -maxY;
+ x = num(y * area.width / area.height);
+ }
+ areaOffset.right = x;
+ areaOffset.bottom = y;
+ }
+ break;
+ }
+ // console.log(x, y, JSON.stringify(areaOffset))
+ changeAreaRect({
+ instance: o,
+ });
+ // this.draw();
+ }
+ } else if (e.touches.length == 2) { // 双点触摸缩放
+ var start = getDistanceByTouches(touches);
+ var end = getDistanceByTouches(e.touches);
+ scaleImage({
+ instance: o,
+ check: !area.bounce,
+ scale: (end.c - start.c) / 100,
+ x: end.x,
+ y: end.y
+ });
+ touchType = 'scale';
+ } else if(touchType === 'scale') {// 从双点触摸变成单点触摸 / 从缩放变成拖动
+ touchType = 'move';
+ } else {
+ changeImageRect({
+ instance: o,
+ check: !area.bounce,
+ x: e.touches[0].pageX - touches[0].pageX,
+ y: e.touches[0].pageY - touches[0].pageY
+ });
+ touchType = 'move';
+ }
+ touches = e.touches;
+ },
+ /**
+ * 触摸结束
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ touchend: function(e, o) {
+ if(!img.src) return;
+ if(touchType === 'stretch') { // 拉伸裁剪区域的四个角缩放
+ // 裁剪区域宽度被缩放到多少
+ var left = areaOffset.left;
+ var right = areaOffset.right;
+ var top = areaOffset.top;
+ var bottom = areaOffset.bottom;
+ var w = area.width + right - left;
+ var h = area.height + bottom - top;
+ // 图像放大倍数
+ var p = scale * (area.width / w) - scale;
+ // 复原裁剪区域
+ areaOffset = { left: 0, right: 0, top: 0, bottom: 0 };
+ changeAreaRect({
+ instance: o,
+ });
+ scaleImage({
+ instance: o,
+ scale: p,
+ x: area.left + left + (1 === activeAngle || 3 === activeAngle ? w : 0),
+ y: area.top + top + (1 === activeAngle || 2 === activeAngle ? h : 0)
+ });
+ } else if (area.bounce) { // 检查边界并矫正,实现拖动到边界时有回弹效果
+ changeImageRect({
+ instance: o,
+ check: true
+ });
+ }
+ },
+ /**
+ * 顺时针翻转图片90°
+ * @param {Object} e 事件对象
+ * @param {Object} o 组件实例对象
+ */
+ rotateImage: function(e, o) {
+ rotateImage(e, o, 90);
+ },
+ rotateImage90: function(e, o) {
+ rotateImage(e, o, 90)
+ },
+ rotateImage270: function(e, o) {
+ rotateImage(e, o, 270)
+ },
+ // 此处只用于对齐其他平台端的样式参数,防止异常,无作用
+ imageStyles: '',
+ maskStylesList: ['', '', '', ''],
+ borderStyles: '',
+ gridStylesList: ['', '', '', ''],
+ angleStylesList: ['', '', '', ''],
+ circleBoxStyles: '',
+ circleStyles: '',
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 74a2c76..ef24f6e 100644
--- a/pages.json
+++ b/pages.json
@@ -197,6 +197,17 @@
}
}
},
+ {
+ "path": "selectPatientSingle/selectPatientSingle",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarRightButton":{ "hide": true},
+ "navigationBarTitleText": "uni-app分页",
+ "app": {
+ "bounce": "none"
+ }
+ }
+ },
{
"path": "searchNews/searchNews",
"style": {
diff --git a/pages_app/personInfo/personInfo.vue b/pages_app/personInfo/personInfo.vue
index 7ef9e9f..6f322ba 100644
--- a/pages_app/personInfo/personInfo.vue
+++ b/pages_app/personInfo/personInfo.vue
@@ -26,9 +26,12 @@
-
+
姓名*
- {{ form.realName }}
+
+ {{ form.realName }}
+
+
@@ -59,7 +62,7 @@
-
+
邮箱
{{ form.email || '' }}
@@ -90,7 +93,7 @@
-
+
科室电话*
{{ form.officePhone }}
@@ -108,7 +111,7 @@
-
+
执业医师证编号*
{{ form.certificate }}
@@ -135,7 +138,7 @@
-
+
个人简介
{{ form.intro || '暂无简介' }}
@@ -197,7 +200,7 @@
- {{ dept }}
+ {{ office.name }}
@@ -212,19 +215,57 @@
- {{ title }}
+ {{ title.name }}
+
+
+
+
+
+
+ {{ item }}
+
+
+ 最多可选择10项({{ selectedSpecialties.length }}/10)
+
+
+
+
+
+
+
+
+ {{ g }}
+
+
+
diff --git a/pages_app/schedule/schedule.vue b/pages_app/schedule/schedule.vue
index 146f4f3..a9bc0e8 100644
--- a/pages_app/schedule/schedule.vue
+++ b/pages_app/schedule/schedule.vue
@@ -112,7 +112,7 @@
const remindPatient = ref(true);
const headerYear = ref('');
const headerDay = ref('');
-
+ const patientUuid = ref('');
// 返回上一页
const goBack = () => {
uni.navigateBack();
@@ -141,12 +141,15 @@
// 选择患者
const selectPatient = () => {
- uni.showActionSheet({
- itemList: ['张三', '李四', '王五', '赵六'],
- success: (res) => {
- selectedPatient.value = ['张三', '李四', '王五', '赵六'][res.tapIndex];
+ navTo({
+ url:'/pages_app/selectPatientSingle/selectPatientSingle',
+ events: {
+ onPatientsSelected: (data) => {
+ selectedPatient.value = data.realName;
+ patientUuid.value = data.uuid;
+ }
}
- });
+ })
};
// 选择日期
diff --git a/pages_app/selectPatientSingle/selectPatientSingle.vue b/pages_app/selectPatientSingle/selectPatientSingle.vue
new file mode 100644
index 0000000..7376c60
--- /dev/null
+++ b/pages_app/selectPatientSingle/selectPatientSingle.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ p.realName || '-' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_app/visit/visit.vue b/pages_app/visit/visit.vue
index 318384b..6f5f6c3 100644
--- a/pages_app/visit/visit.vue
+++ b/pages_app/visit/visit.vue
@@ -191,7 +191,16 @@
};
const selectPatient=()=>{
if(from.value=='patientMsg'){
- navTo({url:'/pages_app/selectPatient/selectPatient'})
+ navTo({
+ url:'/pages_app/selectPatient/selectPatient',
+ events: {
+ onPatientsSelected: ({ ids, list }) => {
+ //console.log(ids, list)
+ patientUuid.value = list.map(item=>item.uuid).join(',');
+ patientName.value = list.map(item=>item.realName).join(',');
+ }
+ }
+ })
}
};
diff --git a/pages_app/writeInfo/writeInfo.vue b/pages_app/writeInfo/writeInfo.vue
index 67a0005..3d53a86 100644
--- a/pages_app/writeInfo/writeInfo.vue
+++ b/pages_app/writeInfo/writeInfo.vue
@@ -3,7 +3,7 @@
-
+
-
+
+
+ v-model.trim="content"
+
+ >
+
+
+
+
- 请填写您的真实邮箱,以便联系上您
+ {{ hint }}
@@ -37,8 +44,47 @@
@@ -71,6 +122,9 @@ const onSave = () => {
.content {
padding: 24rpx 30rpx;
+ textarea{
+ min-height:400rpx;
+ }
}
.input-wrapper {
@@ -81,8 +135,8 @@ const onSave = () => {
}
.input {
- height: 72rpx;
- line-height: 72rpx;
+ height: 60rpx;
+ line-height:60rpx;
font-size: 28rpx;
color: #333;
}
@@ -94,7 +148,7 @@ const onSave = () => {
.hint {
margin-top: 24rpx;
font-size: 26rpx;
- color: #666;
+ color: #333;
}
.footer {
diff --git a/pages_app/writeInfo/wtiteInfo.vue b/pages_app/writeInfo/wtiteInfo.vue
deleted file mode 100644
index b7fdde8..0000000
--- a/pages_app/writeInfo/wtiteInfo.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
- {{ eitType === 'email' }}
-
-
-
-
-
-
-
-
-
-
- 请填写您的真实邮箱,以便联系上您
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue b/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue
index bfb34fb..0d2ac33 100644
--- a/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue
+++ b/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue
@@ -617,6 +617,9 @@