@zscreate/zhxy-app-component 1.0.92 → 1.0.93-table-app.2

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

@@ -15,7 +15,7 @@
 
     <view v-if="widget.type ==='custom'" class="evan-form-item-container"
           :class="'evan-form-item-container--' + labelPosition"
-          :style="{borderWidth:border?'1upx':0}">
+          >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -27,7 +27,7 @@
     <!-- input  -->
     <view v-if="widget.type ==='input'" class="evan-form-item-container"
           :class="'evan-form-item-container--' + labelPosition"
-          :style="{borderWidth:border?'1upx':0}">
+          >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -40,7 +40,7 @@
 
     <!-- uploadModel -->
     <view v-else-if="widget.type ==='uploadModel'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -57,7 +57,7 @@
 
     <!-- textarea  -->
     <view v-else-if="widget.type ==='textarea'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -72,7 +72,7 @@
 
     <!-- rate  -->
     <view v-else-if="widget.type ==='rate'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -82,15 +82,15 @@
                   :max="widget.options.max ? widget.options.max : 1000000" :value="dataModel" @change="changeRate"
                   :disabled="widget.options.disabled">
         </uni-rate>
-        <view class="u_close" v-if="!widget.options.disabled" @click="dataModel = 0">
-          <u-icon name="close-circle" color="#999999" size="38"></u-icon>
+        <view class="u_close" v-if="dataModel && !widget.options.disabled" @click="dataModel = 0">
+          <uni-icons type="clear" color="#e1e1e1" size="14"></uni-icons>
         </view>
       </view>
     </view>
 
     <!-- radio  -->
     <view v-else-if="widget.type ==='radio'" :class="'evan-form-item-container--' + labelPosition"
-          :style="{borderWidth:border?'1upx':0}">
+          >
       <view class="radio-height evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}"
             style="padding-left: 30rpx;" :style="mLabelStyle">{{ widget.name }}
@@ -114,7 +114,7 @@
 
     <!-- switch -->
     <view v-else-if="widget.type ==='switch'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -127,7 +127,7 @@
 
     <!-- slider -->
     <view v-else-if="widget.type ==='slider'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -141,7 +141,7 @@
 
     <!-- checkbox -->
     <view v-else-if="widget.type ==='checkbox'" @click.native="isClickByUser = true"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="radio-height evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}"
             style="padding-left: 30rpx;" :style="mLabelStyle">{{ widget.name }}
@@ -167,7 +167,7 @@
 
     <!-- date -->
     <view v-else-if="widget.type ==='date'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -199,14 +199,14 @@
         </view>
         <view class="u_close" v-if="widget.options.clearable && dataModel && !widget.options.disabled"
           @click="handleClose">
-          <u-icon name="close-circle" color="#999999" size="38"></u-icon>
+          <u-icon name="close-circle" color="#999999" size="18"></u-icon>
         </view> -->
       </view>
     </view>
 
     <!-- time -->
     <view v-else-if="widget.type ==='time'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -235,14 +235,14 @@
         </view>
         <view class="u_close" v-if="widget.options.clearable && getTime(dataModel) && !widget.options.disabled"
               @click="handleClose">
-          <u-icon name="close-circle" color="#999999" size="38"></u-icon>
+          <uni-icons type="clear" color="#e1e1e1" size="14"></uni-icons>
         </view>
       </view>
     </view>
 
     <!-- color -->
     <view v-else-if="widget.type ==='color'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -255,7 +255,7 @@
 
     <!-- imgupload -->
     <view v-else-if="widget.type ==='imgupload'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -267,21 +267,21 @@
 
     <!-- fileupload -->
     <view v-else-if="widget.type ==='fileupload'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle">
-        <l-file :url="actionUrl + widget.options.action" :disabled="widget.options.disabled"
-                @filePost="filePost" @fileDelete="fileDelete" :defaultFile="dataModel" :widget="widget.options">
+        <l-file :url="getUploadFileUrl(widget)" :disabled="widget.options.disabled"
+                @filePost="filePost" @fileDelete="fileDelete" :defaultFile="dataModel" :widget="widget">
         </l-file>
       </view>
     </view>
 
     <!-- editor -->
     <!-- <view v-else-if="widget.type ==='editor'" class="evan-form-item-container"
-      :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+      :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
         :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{widget.name}}
@@ -294,7 +294,7 @@
 
     <!-- cascader -->
     <view v-else-if="widget.type ==='cascader'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -308,7 +308,7 @@
 
     <!-- number  -->
     <view v-else-if="widget.type ==='number'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -324,7 +324,7 @@
 
     <!-- codeControl  -->
     <view v-else-if="widget.type ==='codeControl'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -336,7 +336,7 @@
 
     <!-- superLink  -->
     <view v-else-if="widget.type ==='superLink'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -350,7 +350,7 @@
 
     <!-- placeholder  -->
     <view v-else-if="widget.type ==='placeholder'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -365,7 +365,7 @@
 
     <!-- signature-write  -->
     <view v-else-if="widget.type ==='signature-write'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -389,7 +389,7 @@
 
     <!-- select  -->
     <view v-else-if="widget.type ==='select'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -404,13 +404,13 @@
     <!-- userSelector  -->
     <view v-else-if="widget.type ==='userSelector'" @click.native="isClickByUser = true"
           class="evan-form-item-container" :class="'evan-form-item-container--' + labelPosition"
-          :style="{borderWidth:border?'1upx':0}">
+          >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle"
-            @click.stop="selectUser(widget.options.multiple)">
+            @click="selectUser(widget.options.multiple)">
         <!-- <input class="form-input" placeholder-class="form-input-placeholder" v-model="dataModelShow"
           :placeholder="widget.options.placeholder" :disabled="widget.options.disabled" /> -->
         <view class="form-input">{{ dataModelShow ? dataModelShow : widget.options.placeholder }}</view>
@@ -420,14 +420,14 @@
     <!-- userSelectorByRole  -->
     <view v-else-if="widget.type ==='userSelectorByRole'" @click.native="isClickByUser = true"
           class="evan-form-item-container" :class="'evan-form-item-container--' + labelPosition"
-          :style="{borderWidth:border?'1upx':0}">
+          >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle"
-            @click.stop="selectUserByRole(widget)">
-        <user-select-by-role ref="userSelectByRole" @ok="handleSelectRoleUserOk"/>
+            @click="selectUserByRole(widget)">
+<!--        <user-select-by-role ref="userSelectByRole" @ok="handleSelectRoleUserOk"/>-->
         <!-- <input class="form-input" placeholder-class="form-input-placeholder" v-model="dataModelShow"
           :placeholder="widget.options.placeholder" :disabled="widget.options.disabled" /> -->
         <view class="form-input">{{ dataModelShow ? dataModelShow : widget.options.placeholder }}</view>
@@ -437,13 +437,13 @@
 
     <!-- deptSelector  -->
     <view v-else-if="widget.type ==='deptSelector'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle"
-            @click.stop="selectdept(widget.options.multiple)">
+            @click="selectdept(widget.options.multiple)">
         <!-- <input class="form-input" placeholder-class="form-input-placeholder" v-model="dataModelShow"
           :placeholder="widget.options.placeholder" :disabled="widget.options.disabled"
           :departvalue="widget.options.defaultValue" /> -->
@@ -453,7 +453,7 @@
 
     <!-- relateSub -->
     <view v-else-if="widget.type ==='relateSub'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
@@ -468,7 +468,7 @@
 
     <!-- richEditor -->
     <view v-else-if="widget.type === 'hnkj-richEditor'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{widget.name}}
@@ -485,7 +485,7 @@
 
     <!-- nameSignature 签名  -->
     <view v-if="widget.type ==='hnkj-nameSignature'" class="evan-form-item-container"
-          :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
+          :class="'evan-form-item-container--' + labelPosition" >
       <view class="evan-form-item-container__label"
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{widget.name}}
@@ -531,13 +531,13 @@ import {
 import {
   getMode
 } from './utilForForm'
-import UserSelectByRole from "../userSelectByRole/userSelectByRole";
 import {downloadFile} from "../../utils/util";
+import XpPicker from "../xp-picker/xp-picker.vue";
 
 export default {
   mixins: [computedMixin, validateFormMixin, pubSubMixin, valueChangeMixin],
   components: {
-    UserSelectByRole,
+    'xp-picker': XpPicker,
     UniRate,
     tColorPicker,
     unploadFile,
@@ -691,6 +691,15 @@ export default {
     uni.$off(this.widget.model);
   },
   methods: {
+    getUploadFileUrl(widget) {
+      let action = ''
+      if (String(widget.options.action).startsWith('http')) {
+        action = this.widget.options.action;
+      } else {
+        action = this.actionUrl.includes('sys/common/upload') ? this.actionUrl : (this.actionUrl + '/sys/common/upload')
+      }
+      return action
+    },
     // 图片加载失败，就显示dataModel
     nameSignLoadError() {
       this.nameSign = ''
@@ -1091,7 +1100,6 @@ export default {
       });
       this.$emit("input-change", val, this.widget.model);
     },
-    /****/
     // getParentModels(){
     // 	Pubsub.subscribe('randomObserve',(msg,data) => {
     // 		// console.log('fu传递model',msg, data)
@@ -1110,8 +1118,9 @@ export default {
       }
       return false
     },
-    /****选择人员****/
+    // 选择人员
     selectUser(flag) {
+
       if (this.widget.options.disabled) return
       this.isClickByUser = true
       var PubsubSign = 'SelectUser' + String(Math.random()).split('.')[1];
@@ -1137,7 +1146,7 @@ export default {
     selectUserByRole(widget) {
       if (widget.options.disabled) return
       this.isClickByUser = true
-      this.$refs.userSelectByRole.init(widget, this.dataModel)
+      // this.$refs.userSelectByRole.init(widget, this.dataModel)
     },
     handleSelectRoleUserOk(value) {
       this.dataModelShow = ""
@@ -1328,6 +1337,15 @@ export default {
 
 <style lang="scss" scoped>
 @import "../../static/uni.css";
+//.clear-btn {
+//  position: absolute;
+//  width: 31px;
+//  height: 31px;
+//  line-height: 31px;
+//  z-index: 80;
+//  top: 0;
+//  right: 0px;
+//}
 
 $form-item-bottom-padding: 20rpx; // 每个组件底部间隔
 
@@ -1339,7 +1357,7 @@ icon {
 }
 
 .u_close {
-  padding: 20rpx 20rpx;
+  width: 31px;
   position: absolute;
   right: 0;
   top: 72%;
@@ -1478,7 +1496,7 @@ checkbox-group label {
   }
 }
 
-/deep/ .form-input-placeholder {
+::v-deep  .form-input-placeholder {
   // line-height: 90upx;
   color: #555;
 }
@@ -1497,7 +1515,7 @@ checkbox-group label {
   display: inline-block;
 }
 
-/deep/ .wx-picker-container .wx-picker-action.wx-picker-action-confirm {
+::v-deep  .wx-picker-container .wx-picker-action.wx-picker-action-confirm {
   color: #007AFF !important;
 }
 

package/components/form-container/form-container.vue

@@ -749,19 +749,20 @@ export default {
                     }
                 }
                 // console.log(promiseArr)
-                Promise.all(promiseArr).then((result) => {
-                    console.log(result, promiseArr.length)
-                    if (result.length === promiseArr.length) {
-                        console.log('校验成功')
-                        fn(this.models)
-                    } else {
-                        console.log('校验失败')
-                        fn('failed')
-                    } //['成功了', 'success']
-                }).catch((error) => {
-                    console.log(error)
-                })
+
             }
+          Promise.all(promiseArr).then((result) => {
+            console.log(result, promiseArr.length)
+            if (result.length === promiseArr.length) {
+              console.log('校验成功')
+              fn(this.models)
+            } else {
+              console.log('校验失败')
+              fn('failed')
+            } //['成功了', 'success']
+          }).catch((error) => {
+            console.log(error)
+          })
             // this.$refs.form.validate((res) => {
             // 	if (res) {
             // 		uni.showToast({

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

@@ -69,7 +69,7 @@
 		},
 		methods: {
 			getShow(val){
-				if(val && val.length>=this.widget.length){
+				if(val && val.length>=this.widget.options.length){
 					this.isShow = false
 				}
 				else{
@@ -85,7 +85,8 @@
 			},
 			chooseMessageFile: function(e) {
 				console.log(this.widget, )
-				if (this.disabled || (this.defaultFile.length && this.defaultFile.length >= this.widget.length)) return false;
+        const { options } = this.widget
+				if (this.disabled || (this.defaultFile.length && this.defaultFile.length >= options.length)) return false;
 				var that = this;
         //#ifdef H5
         uni.chooseFile
@@ -96,10 +97,19 @@
         ({
 					count: 1,
 					type: 'all',
-					success(res) {
+					success: (res) => {
 						console.log(res.tempFiles)
 						const path = res.tempFiles
+            const { ext = '' } = this.widget
 						that.name = res.tempFiles[0].name
+            console.log(ext, that.name.split('.').pop())
+            if (!ext.includes(that.name.split('.').pop())) {
+              return uni.showToast({
+                title: `不支持该文件`,
+                icon: 'none'
+              })
+            }
+
 						const uploadTask = uni.uploadFile({
 							url: that.url,
 							filePath: path[0].path,

package/components/uploadFile/uploadFile.vue

@@ -1,123 +1,177 @@
 <template>
-	<view>
-		<u-upload ref="uUpload" :file-list="fileList" :action="action" :upload-text="widget.options.placeholder" :max-size="maxSize"
-		 width="150" height="150" :multiple="false" :max-count="maxCount" :disabled="disabled" @on-remove="onRemove" @on-oversize="onOversize" @on-success="onSuccess"
-		 :show-progress="showProgress" ></u-upload>
-		 <!-- uview组件 修改了 disabled 用法 更新需要注意 -->
-	</view>
+  <view>
+    <u-upload ref="uUpload" :file-list="fileList" :action="action"
+              @afterRead="afterRead"
+              @delete="onRemove"
+              :upload-text="widget.options.placeholder" :max-size="maxSize"
+              width="150" height="150" :multiple="false" :max-count="maxCount" :disabled="disabled" @on-remove="onRemove" @on-oversize="onOversize" @on-success="onSuccess"
+              :show-progress="showProgress" ></u-upload>
+    <!-- uview组件 修改了 disabled 用法 更新需要注意 -->
+  </view>
 </template>
 
 <script>
-	var _self;
-	export default {
-		props: {
-			defaultImg: {
-				type: Array,
-				default: () => {
-					return []
-				}
-			},
-			widget: {
-				type: Object,
-				default: () => {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				actionUrl: this.uniEnv.uploadUrl,
-				action: '',
-				percent: 0,
-				upimg: '',
-				maxCount: 8,
-				maxSize: 300000,
-				disabled: false,
-				show: true,
-				fileList: [],
-				emitList:[],
-				showProgress: true
-			};
-		},
-		created() {
-			if (this.widget && Object.keys(this.widget).length > 0) {
-				this.initWidget();
-				this.showImage();
-			}
+var _self;
+export default {
+  props: {
+    defaultImg: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    widget: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      actionUrl: this.uniEnv.uploadUrl,
+      action: '',
+      percent: 0,
+      upimg: '',
+      maxCount: 8,
+      maxSize: 300000,
+      disabled: false,
+      show: true,
+      fileList: [],
+      emitList:[],
+      showProgress: true
+    };
+  },
+  created() {
+    if (this.widget && Object.keys(this.widget).length > 0) {
+      this.initWidget();
+      this.showImage();
+    }
 
-		},
-		mounted() {
-			this.upimg = this.img
-		},
+  },
+  mounted() {
+    this.upimg = this.img
+  },
 
-		methods: {
-			onOversize(val, lists, index){
-				// uni.showToast({
-				// 	title: '超出允许的文件大小',
-				// 	icon: 'none',
-				// 	duration: 2000
-				// });
-			},
-			showImage() {
-				this.emitList = this.defaultImg
-				this.showProgress = false;
-				if (this.defaultImg && this.defaultImg.length && this.defaultImg.length > 0) {
-					this.fileList = this.defaultImg
-						.map((item,index) => {
-							let tempItem = { ...item,
-							};
-							tempItem.url = this.uniEnv.imgUrl + tempItem.url;
-							return tempItem;
-						})
+  methods: {
+    async afterRead(event) {
+      const { ext = '' }  = this.widget
+      if (!ext.includes(event.name.split('.').pop())) {
+        return uni.showToast({
+          title: `不支持该文件`,
+          icon: 'none'
+        })
+      }
+      // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+      let lists = [].concat(event.file)
+      // lists.map((item) => {
+      //   this.fileList.push({
+      //     ...item,
+      //     status: 'uploading',
+      //     message: '上传中'
+      //   })
+      // })
+      for (let i = 0; i < lists.length; i++) {
+        const result = await this.uploadFilePromise(lists[i].url)
+        let id = new Date().getTime();
+        const item = {
+          key: id,
+          uid: id,
+          url:  result,
+          status: "done",
+          name: id
+        }
+        this.emitList.push(item)
+        this.fileList.push(Object.assign({}, item, {url: this.uniEnv.imgUrl + item.url}))
+        this.$emit('imgUrlPost', this.emitList)
+      }
+    },
+    uploadFilePromise(url) {
+      return new Promise((resolve, reject) => {
+        uni.uploadFile({
+          url: this.action,
+          filePath: url,
+          name: 'file',
+          success: (uploadFileRes) => {
+            const res = JSON.parse(uploadFileRes.data)
+            resolve(res.message)
+          }
+        });
+      })
+    },
+    onOversize(val, lists, index){
+      // uni.showToast({
+      // 	title: '超出允许的文件大小',
+      // 	icon: 'none',
+      // 	duration: 2000
+      // });
+    },
+    showImage() {
+      this.emitList = this.defaultImg
+      this.showProgress = false;
+      if (this.defaultImg && this.defaultImg.length && this.defaultImg.length > 0) {
+        this.fileList = this.defaultImg
+            .map((item,index) => {
+              let tempItem = { ...item,
+              };
+              tempItem.url = this.uniEnv.imgUrl + tempItem.url;
+              return tempItem;
+            })
 
-						console.log(this.fileList)
-				}
-			},
-			initWidget() {
-				//action url
-				this.action = this.actionUrl + this.widget.options.action;
-				//文件大小限制
-				this.maxSize = this.widget.options.fileSize ? this.widget.options.fileSize * 1000 : 300000;
+        console.log(this.fileList)
+      }
+    },
+    initWidget() {
+      //action url
+      if (String(this.widget.options.action).startsWith('http')) {
+        this.action = this.widget.options.action;
+      } else {
+        this.action = this.actionUrl.includes('sys/common/upload') ? this.actionUrl : (this.actionUrl + '/sys/common/upload')
+      }
+      //文件大小限制
+      this.maxSize = this.widget.options.fileSize ? this.widget.options.fileSize * 1000 : 300000;
 
-				// this.maxSize = 100
-				//最大上传个数
-				this.maxCount = parseInt(this.widget.options.length);
-				//是否禁用
-				this.disabled = this.widget.options.disabled;
-			},
-			// beforeUpload(index, list) {
+      // this.maxSize = 100
+      //最大上传个数
+      this.maxCount = parseInt(this.widget.options.length);
+      //是否禁用
+      this.disabled = this.widget.options.disabled;
+    },
+    // beforeUpload(index, list) {
 
-			// 	let errorIndex = list.findIndex( item => {
-			// 		return item.file.size > this.maxSize
-			// 	})
-			// 	if (errorIndex > -1) {
-			// 		uni.showToast({
-			// 			title: '超出允许的文件大小',
-			// 			duration: 2000
-			// 		});
-			// 		return
-			// 	}
+    // 	let errorIndex = list.findIndex( item => {
+    // 		return item.file.size > this.maxSize
+    // 	})
+    // 	if (errorIndex > -1) {
+    // 		uni.showToast({
+    // 			title: '超出允许的文件大小',
+    // 			duration: 2000
+    // 		});
+    // 		return
+    // 	}
 
-			// },
-			onSuccess(data, index, lists, name) {
-				let id = new Date().getTime();
-				let imgArr = data.message.split('/');
-				let _name = imgArr[imgArr.length - 1]
-				this.emitList.push({
-					key: id,
-					uid: id,
-					url: data.message,
-					status: "done",
-					name: _name
-				});
-				this.$emit('imgUrlPost', this.emitList)
-			},
-			onRemove(index, lists, name) {
-				this.emitList.splice(index, 1);
-				this.$emit('imgUrlPost', this.emitList)
-			}
-		}
-	}
+    // },
+    onSuccess(data, index, lists, name) {
+      let id = new Date().getTime();
+      let imgArr = data.message.split('/');
+      let _name = imgArr[imgArr.length - 1]
+      this.emitList.push({
+        key: id,
+        uid: id,
+        url: data.message,
+        status: "done",
+        name: _name
+      });
+      this.$emit('imgUrlPost', this.emitList)
+    },
+    onRemove(index, lists, name) {
+      if (typeof(index) === 'object') index = index.index
+      this.emitList.splice(index, 1);
+      this.fileList.splice(index, 1);
+      this.$emit('imgUrlPost', this.emitList)
+    }
+  }
+}
 </script>
 
 <style lang="less" scoped>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.92",
+	"version": "1.0.93-table-app.2",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",

package/components/userSelectByRole/userSelectByRole.vue

@@ -1,210 +0,0 @@
-<template>
-  <u-popup v-model="roleSelectShow"  width="100%">
-    <view class="role-select-body" style="padding: 20rpx; margin-top: 40rpx">
-      <view>角色选择</view>
-      <u-radio-group v-model="roleChecked" >
-        <u-radio
-            @change="roleChange"
-            v-for="(item, index) in rolesList" :key="index"
-            :name="item.id"
-        >
-          {{item.roleName}}
-        </u-radio>
-      </u-radio-group>
-      <view style="margin-top: 20rpx; display: flex; flex-wrap: wrap">
-        <view>已选：</view>
-        <u-tag style="margin-right: 5px" v-for="val in currValue" :text="val.realname" closeable @close="removeClick(val)" :key="val.id" />
-      </view>
-      <view style="margin-top: 20rpx">
-        <u-table>
-          <u-tr>
-            <u-th width="50px" style="box-sizing: border-box">
-              <view v-if="multiple">
-                <u-checkbox :value="isAllCheck" @change="roleCheckAll">
-                </u-checkbox>
-              </view>
-              <view v-else>选择</view>
-            </u-th>
-            <u-th >姓名</u-th>
-            <u-th>所属部门</u-th>
-          </u-tr>
-          <u-tr v-for="user in roleUserList" :key="user.id">
-            <u-td width="50px" >
-              <view>
-                <u-checkbox v-model="user.checked" @change="handleCheck" :name="user.id">
-                </u-checkbox>
-              </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>
-
-      </view>
-
-      <view style="display: flex; justify-content: space-between; margin-top: 20rpx">
-        <u-button type="primary" size="medium" @click="handleSelectRoleUserOk">确定</u-button>
-        <u-button size="medium" @click="roleSelectShow = false">取消</u-button>
-      </view>
-    </view>
-
-
-    <t-loading :isLoading="isLoading"/>
-  </u-popup>
-</template>
-
-<script>
-import {cloneObj} from "../../utils/util";
-
-export default {
-  name: "userSelectByRole",
-  props: {
-
-  },
-  data() {
-    return {
-      roleSelectShow: false,
-      rolesList: [],
-      roleUserList: [],
-      currValue: [],
-      role: '',
-      multiple: false,
-      depId: '',
-      roleChecked: '',
-      isLoading: true,
-    }
-  },
-  computed: {
-    checkIds() {
-      return this.currValue.map(item => item.id)
-    },
-    isAllCheck() {
-      if (this.roleUserList.length === 0) return false
-      return this.roleUserList.every(item => item.checked)
-    },
-  },
-  methods: {
-    init(widget, value) {
-      this.roleSelectShow = true
-      this.isLoading = true
-      if (widget.options.departRelation) {
-        const userInfo = uni.getStorageSync('userinfo')
-        console.log("userInfo: ", userInfo)
-        this.depId = userInfo.departId || userInfo.depart_id
-      }
-      this.role = widget.options.role
-      this.multiple = widget.options.multiple
-      this.currValue = cloneObj(value || [])
-      this.$u.get('/sys/role/list', {
-        pageNo: 1,
-        pageSize: 100000,
-      }).then(res => {
-        this.rolesList = res.result.records.filter((item) => {
-          return this.role.includes(item.id);
-        })
-      }).finally(() => {
-        this.isLoading = false
-      })
-    },
-    removeClick(val) {
-      this.currValue = this.currValue.filter(item => item.id !== val.id)
-      const len = this.roleUserList
-      this.roleUserList.checked =  this.roleUserList.filter((item, idx) => {
-        if (val.id === item.id) this.$set(item, 'checked', false )
-        return item.checked
-      }).length === len
-    },
-    handleCheck({value , name}) {
-      console.log(value, name)
-      if (!this.multiple) {
-        this.currValue = []
-        this.roleUserList = this.roleUserList.map((item, idx) => {
-          item.checked = false
-          return item
-        })
-      }
-      if (!value) {
-        this.currValue = this.currValue.filter(item => item.id != name)
-      }
-      const len = this.roleUserList
-      this.roleUserList.checked =  this.roleUserList.filter((item, idx) => {
-        if (item.id === name) {
-          if (value && !this.checkIds.includes(item.id)) {
-            this.currValue.push(item)
-          }
-          this.$set(item, 'checked', value)
-          return value
-        }
-        return item.checked
-      }).length === len
-      console.log(this.currValue)
-    },
-
-    handleSelectRoleUserOk() {
-      this.roleSelectShow = false
-      //   let checked  = this.roleUserList.filter(item => {
-      //     if (item.checked) return item
-      //   })
-      //
-      // let ids = []
-      // checked = checked.concat(this.currValue).filter(item => {
-      //   if (ids[item.id]) return false
-      //   ids[item.id] = true
-      //   return item
-      // })
-
-      this.$emit("ok", this.currValue)
-    },
-    roleCheckAll({value}) {
-      this.roleUserList.checked != this.roleUserList.checked
-      if (value) {
-        this.roleUserList.forEach(item => {
-          if (!this.checkIds.includes(item.id)) {
-            this.currValue.push(item)
-          }
-          this.$set(item, 'checked',  value)
-        })
-      }
-      if (!value) {
-        this.roleUserList.forEach(item => {
-          this.currValue = this.currValue.filter(curr => curr.id !== item.id)
-        })
-      }
-    },
-    roleChange(roleId) {
-      this.isLoading = true
-      this.$u.get('/formApi/listFormUserByRole', {
-        pageNo: 1,
-        pageSize: 100000,
-        depId: this.depId,
-        roleId
-      }).then(res => {
-        this.roleUserList = res.result.records.filter(item => {
-          item.checked = this.checkIds.includes(item.id)
-          return item
-        })
-      }).finally( () => {
-        this.$nextTick(() => {
-          this.isLoading = false
-        })
-      })
-
-    },
-  }
-}
-</script>
-
-<style scoped>
-/deep/ u-th:nth-child(1) {
-  flex: 0 0 40px;
-}
-/deep/ u-th {
-  flex: 1;
-}
-
-
-.role-select-body {
-  display: flex;
-  flex-direction: column;
-}
-</style>