@zscreate/zhxy-app-component 1.0.85 → 1.0.87

package/components/evan-form-item/evan-form-item.vue

@@ -532,6 +532,7 @@ import {
   getMode
 } from './utilForForm'
 import UserSelectByRole from "../userSelectByRole/userSelectByRole";
+import {downloadFile} from "../../utils/util";
 
 export default {
   mixins: [computedMixin, validateFormMixin, pubSubMixin, valueChangeMixin],
@@ -884,63 +885,8 @@ export default {
       // console.log('this.checkboxAndRadioOptions', this.checkboxAndRadioOptions)
     },
 
-    downLoadFile(path) {
-      // console.log(process.uniEnv.uploadUrl)
-      // console.log(path)
-      // #ifdef H5
-      window.open(this.uniEnv.imgUrl + path.url)
-      return
-      // #endif
-      uni.downloadFile({
-        // url: this.downLoadUrl + path, //下载地址接口返回
-        url: this.uniEnv.imgUrl + path.url,
-        filePath: wx.env.USER_DATA_PATH + "/" + path.name,
-        success: (data) => {
-          if (data.statusCode === 200) {
-            //文件保存到本地
-            uni.openDocument({
-              filePath: data.filePath,
-              showMenu: true,
-              success: function (res) {
-                // console.log('打开文档成功');
-              },
-              fail(res) {
-                console.log(res)
-                uni.showToast({
-                  icon: 'none',
-                  mask: true,
-                  title: '下载失败',
-                  duration: 3000,
-                });
-              },
-            });
-            // uni.saveFile({
-            // 	tempFilePath: data.tempFilePath, //临时路径
-            // 	success: function(res) {
-            // 		uni.showToast({
-            // 			icon: 'none',
-            // 			mask: true,
-            // 			title: '文件已保存：' + res.savedFilePath, //保存路径
-            // 			duration: 3000,
-            // 		});
-            // 		setTimeout(() => {
-            // 			//打开文档查看
-            // 			uni.openDocument({
-            // 				filePath: res.savedFilePath,
-            // 				success: function(res) {
-            // 					// console.log('打开文档成功');
-            // 				},
-            // 				complete: function(res) {}
-            // 			});
-            // 		}, 3000)
-            // 	}
-            // });
-          }
-        },
-        complete: function (res) {
-          // console.log(res)
-        }
-      })
+    downLoadFile(item) {
+      downloadFile(this.downloadUrl, { path: item.url, name: item.name })
     },
 
     /**纠错**/

package/components/l-file/l-file.vue

@@ -24,7 +24,9 @@
 </template>
 
 <script>
-	export default {
+	import {downloadFile} from "../../utils/util";
+
+  export default {
 		props: {
 			widget: {
 				type: Object,
@@ -48,7 +50,6 @@
 				name: "",
 				percent: 0,
 				show: true,
-				imgViewUrl: this.LFileBaseUrl,
 		    isShow:true,//是否展示点击上传
 			}
 		},
@@ -80,82 +81,7 @@
 				this.$emit('fileDelete', idx)
 			},
 			downLoadFile(path, name) {
-        //#ifdef H5
-        const a = document.createElement("a")
-        a.href = this.downLoadUrl + path
-        a.target = '_blank'
-        a.download = name
-        a.click()
-        return
-        //#endif
-
-				let type = '';
-				const fileTypes = ['doc', 'docx', 'pdf', 'xls', 'xlsx', 'ppt', 'pptx'];
-        const imageTypes = ['png', 'jpeg', 'jpg', 'gif']
-        if (path) {
-          let str = path.split('.');
-          type = str[str.length - 1]
-          type = type.toString().toLowerCase()
-        }
-        if (imageTypes.includes(type)) {
-          uni.previewImage({
-            count: 1,
-            urls: [ this.downLoadUrl + path ],
-            fail() {
-              uni.showToast({
-                icon: 'none',
-                mask: true,
-                title: '图片打开失败！',
-                duration: 3000,
-              });
-            }
-          })
-          return
-        }
-
-        wx.downloadFile({
-          url: this.downLoadUrl + path,
-          filePath: wx.env.USER_DATA_PATH + "/" + name,
-          success: function (res) {
-            console.log(res)
-            if (fileTypes.includes(type)) {
-              uni.openDocument({
-                filePath: res.filePath,
-                showMenu: true,
-                fileType: type,
-                fail(res) {
-                  console.log(res)
-                  uni.showToast({
-                    icon: 'none',
-                    mask: true,
-                    title: '文件打开失败！',
-                    duration: 3000,
-                  });
-                },
-              });
-            } else {
-              wx.shareFileMessage({
-                filePath: res.filePath,
-                success: function(res) {
-                  console.log("下载成功" + res.savedFilePath)
-                  console.log(JSON.stringify(res))
-                },
-                fail: (err) => {
-                  console.log("save error: " + err)
-                }
-              })
-            }
-          },
-          fail(res) {
-            console.log(res)
-            uni.showToast({
-              icon: 'none',
-              mask: true,
-              title: '下载失败',
-              duration: 3000,
-            });
-          },
-        })
+        downloadFile(this.downloadUrl, { path, name })
 			},
 			chooseMessageFile: function(e) {
 				console.log(this.widget, )

package/components/userSelectByRole/userSelectByRole.vue

@@ -23,8 +23,9 @@
                 <u-checkbox :value="isAllCheck" @change="roleCheckAll">
                 </u-checkbox>
               </view>
+              <view v-else>选择</view>
             </u-th>
-            <u-th>姓名</u-th>
+            <u-th >姓名</u-th>
             <u-th>所属部门</u-th>
           </u-tr>
           <u-tr v-for="user in roleUserList" :key="user.id">
@@ -34,8 +35,8 @@
                 </u-checkbox>
               </view>
             </u-td>
-            <u-td><view>{{ user.realname }}</view></u-td>
-            <u-td style="word-break: break-all; white-space: nowrap;  overflow: hidden; text-overflow: ellipsis;"><view>{{ user.departName }}</view></u-td>
+            <u-td style="flex: 1"><view>{{ user.realname }}</view></u-td>
+            <u-td style="flex: 1; word-break: break-all; white-space: nowrap;  overflow: hidden; text-overflow: ellipsis;"><view>{{ user.departName }}</view></u-td>
           </u-tr>
         </u-table>
 
@@ -48,6 +49,7 @@
     </view>
 
 
+    <t-loading :isLoading="isLoading"/>
   </u-popup>
 </template>
 
@@ -69,6 +71,7 @@ export default {
       multiple: false,
       depId: '',
       roleChecked: '',
+      isLoading: true,
     }
   },
   computed: {
@@ -83,7 +86,7 @@ export default {
   methods: {
     init(widget, value) {
       this.roleSelectShow = true
-
+      this.isLoading = true
       if (widget.options.departRelation) {
         const userInfo = uni.getStorageSync('userinfo')
         console.log("userInfo: ", userInfo)
@@ -91,7 +94,7 @@ export default {
       }
       this.role = widget.options.role
       this.multiple = widget.options.multiple
-      this.currValue = value || []
+      this.currValue = cloneObj(value || [])
       this.$u.get('/sys/role/list', {
         pageNo: 1,
         pageSize: 100000,
@@ -99,8 +102,9 @@ export default {
         this.rolesList = res.result.records.filter((item) => {
           return this.role.includes(item.id);
         });
+      }).finally(() => {
+        this.isLoading = false
       })
-      this.currValue = cloneObj(value)
     },
     removeClick(val) {
       this.currValue = this.currValue.filter(item => item.id !== val.id)
@@ -168,6 +172,7 @@ export default {
       }
     },
     roleChange(roleId) {
+      this.isLoading = true
       this.$u.get('/formApi/listFormUserByRole', {
         pageNo: 1,
         pageSize: 100000,
@@ -178,6 +183,10 @@ export default {
           item.checked = this.checkIds.includes(item.id)
           return item
         })
+      }).finally( () => {
+        this.$nextTick(() => {
+          this.isLoading = false
+        })
       })
 
     },
@@ -186,5 +195,10 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ u-th:nth-child(1) {
+  flex: 0 0 40px;
+}
+/deep/ u-th {
+  flex: 1;
+}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.85",
+	"version": "1.0.87",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",

package/utils/util.js

@@ -66,41 +66,121 @@ var dateUtils = {
 	}
 };
 
-function _debounce(fn, delay) {
-  var delay = delay || 1000;
-  var timer;
-  return function () {
-    var th = this;
-    var args = arguments;
-    if (timer) {
-      clearTimeout(timer);
-    }
-    timer = setTimeout(function () {
-      timer = null;
-      fn.apply(th, args);
-    }, delay);
-  };
+function _debounce(fn, delay) {
+  var delay = delay || 1000;
+  var timer;
+  return function () {
+    var th = this;
+    var args = arguments;
+    if (timer) {
+      clearTimeout(timer);
+    }
+    timer = setTimeout(function () {
+      timer = null;
+      fn.apply(th, args);
+    }, delay);
+  };
 }
 
-function cloneObj (obj) {
-  if(obj === undefined || obj === null){
-    return obj;
-  }
-  var newobj = obj.constructor === Array ? [] : {};
-  if(typeof obj !== 'object'){
-    return obj;
-  } else {//如果不支持以上方法
-    for(var i in obj){
-      newobj[i] = typeof obj[i] === 'object' ? cloneObj(obj[i]) : obj[i];
-    }
-  }
-  return newobj;
-}
+function cloneObj (obj) {
+  if(obj === undefined || obj === null){
+    return obj;
+  }
+  var newobj = obj.constructor === Array ? [] : {};
+  if(typeof obj !== 'object'){
+    return obj;
+  } else {//如果不支持以上方法
+    for(var i in obj){
+      newobj[i] = typeof obj[i] === 'object' ? cloneObj(obj[i]) : obj[i];
+    }
+  }
+  return newobj;
+}
+
+function downloadFile(downLoadUrl, { path, name }) {
+	//#ifdef H5
+	const a = document.createElement("a")
+	a.href = downLoadUrl + path
+	a.target = '_blank'
+	name && (a.download = name)
+	a.click()
+	return
+	//#endif
+
+	let type = '';
+	const fileTypes = ['doc', 'docx', 'pdf', 'xls', 'xlsx', 'ppt', 'pptx'];
+	const imageTypes = ['png', 'jpeg', 'jpg', 'gif']
+	if (path) {
+		let str = path.split('.');
+		type = str[str.length - 1]
+		type = type.toString().toLowerCase()
+	}
+	if (imageTypes.includes(type)) {
+		uni.previewImage({
+			count: 1,
+			urls: [ downLoadUrl + path ],
+			fail() {
+				uni.showToast({
+					icon: 'none',
+					mask: true,
+					title: '图片打开失败！',
+					duration: 3000,
+				});
+			}
+		})
+		return
+	}
+
+	wx.downloadFile({
+		url: downLoadUrl + path,
+		filePath: wx.env.USER_DATA_PATH + "/" + name,
+		success: function (res) {
+			console.log(res)
+			if (fileTypes.includes(type)) {
+				uni.openDocument({
+					filePath: res.filePath,
+					showMenu: true,
+					fileType: type,
+					fail(res) {
+						console.log(res)
+						uni.showToast({
+							icon: 'none',
+							mask: true,
+							title: '文件打开失败！',
+							duration: 3000,
+						});
+					},
+				});
+			} else {
+				wx.shareFileMessage({
+					filePath: res.filePath,
+					success: function(res) {
+						console.log("下载成功" + res.savedFilePath)
+						console.log(JSON.stringify(res))
+					},
+					fail: (err) => {
+						console.log("save error: " + err)
+					}
+				})
+			}
+		},
+		fail(res) {
+			console.log(res)
+			uni.showToast({
+				icon: 'none',
+				mask: true,
+				title: '下载失败',
+				duration: 3000,
+			});
+		},
+	})
+}
 
 module.exports = {
 	formatTime: formatTime,
 	formatLocation: formatLocation,
 	dateUtils: dateUtils,
 	cloneObj: cloneObj,
-	_debounce:_debounce
-}
+	_debounce:_debounce,
+	downloadFile
+}