@zscreate/zhxy-app-component 1.0.93 → 1.0.94

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

@@ -45,7 +45,7 @@
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
       </view>
-      <view class="evan-form-item-container__main evan-form-item-container__textarea" :style="mContentStyle">
+      <view class="evan-form-item-container__main " style="display: block" :style="mContentStyle">
         <view @click.prevent="downLoadFile(item)" style="margin-right: 20px;color: #007AFF;"
               v-for="(item, index) in widget.options.defaultValue" :key="index"
               :class="{disabledClick: widget.options.disabled}">
@@ -134,7 +134,10 @@
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle" style="padding: 0;">
         <slider style="width: 100%;" :value="dataModel" :show-value="true" @change="sliderChange"
-                activeColor="#007AFF" backgroundColor="#E4E7ED" block-size="20"
+                activeColor="#007AFF" backgroundColor="#E4E7ED"
+                :max="widget.options.max"
+                :min="widget.options.min"
+                :step="widget.options.step"
                 :disabled="widget.options.disabled"/>
       </view>
     </view>
@@ -186,7 +189,7 @@
           <view class="evan-form-item-container__main--body">
             <uni-datetime-picker @change="dateChange" @click.native="isClickByUser = true"
                                  :type="widget.options.type" :format="widget.options.format"
-                                 :clearIcon="widget.options.clearable" v-model="dataModel" @maskClick="maskClick"
+                                 :clearIcon="!widget.options.disabled && widget.options.clearable" v-model="dataModel" @maskClick="maskClick"
                                  :border="false" :disabled="widget.options.disabled">
               <view class="option-font-size">
                 {{ dataModel | filterDataModel(widget) }}
@@ -222,7 +225,7 @@
         </view>
         <view class="option-font-size" @tap="showTime(widget.model,0)">
           {{
-            showTimeStr(dataModel, 0) ? showTimeStr(dataModel, 0) : widget.options.placeholder ? widget.options.placeholder : '请选择'
+            showTimeStr(dataModel, 0) ? showTimeStr(dataModel, 0) : (widget.options.startPlaceholder || widget.options.placeholder)
           }}
         </view>
         <view class="option-time-icon" v-if="widget.options.isRange">
@@ -230,7 +233,7 @@
         </view>
         <view v-if="widget.options.isRange" class="option-font-size" @tap="showTime(widget.model,1)">
           {{
-            showTimeStr(dataModel, 1) ? showTimeStr(dataModel, 1) : widget.options.placeholder ? widget.options.placeholder : '请选择'
+            showTimeStr(dataModel, 1) ? showTimeStr(dataModel, 1) :  (widget.options.endPlaceholder || widget.options.placeholder)
           }}
         </view>
         <view class="u_close" v-if="widget.options.clearable && getTime(dataModel) && !widget.options.disabled"
@@ -300,7 +303,7 @@
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle">
-        <lb-picker ref="picker" v-model="dataModel" @change="cityChecked" :value="widget.options.defaultValue"
+        <lb-picker :placeholder="widget.options.placeholder" ref="picker" v-model="dataModel" @change="cityChecked" :value="widget.options.defaultValue"
                    :disabled="widget.options.disabled">
         </lb-picker>
       </view>
@@ -343,7 +346,7 @@
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle">
         <uni-link :href="widget.options.defaultValue" :text="widget.options.title"
-                  :disabled="widget.options.disabled">
+                  :disabled="widget.options.disabled" color="#0c60e1" :showUnderLine="false">
         </uni-link>
       </view>
     </view>
@@ -370,7 +373,7 @@
             :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
         {{ widget.name }}
       </view>
-      <view class="evan-form-item-container__main" :style="mContentStyle">
+      <view class="evan-form-item-container__main" style="display: block" :style="mContentStyle">
         <view style="float: left;">
           <button v-show="!widget.options.disabled" size="mini" type="primary" @click="signatrueFlag = true"
                   style="white-space: nowrap;">签名
@@ -410,7 +413,7 @@
         {{ 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>
@@ -426,8 +429,8 @@
         {{ 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>
@@ -443,7 +446,7 @@
         {{ 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" /> -->
@@ -497,6 +500,14 @@
       </view>
     </view>
 
+    <!-- 公文组件 editorAirt  -->
+    <view v-else-if="widget.type ==='editorAirt'" class="evan-form-item-container"
+          :class="'evan-form-item-container--' + labelPosition" >
+      <view class="evan-form-item-container__main" :style="mContentStyle">
+        <rich-text :nodes="dataModel" style="width: 100%;"></rich-text>
+      </view>
+    </view>
+
     <view class="error-message" v-if="showFalse">{{ showFalseMsg }}</view>
   </view>
 </template>
@@ -505,7 +516,6 @@
 import moment from "../../utils/moment.js";
 import uniDatetimePicker
   from '../../components/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue'
-// import utils from './utils.js'
 import tColorPicker from '../../components/t-color-picker/t-color-picker.vue'
 import unploadFile from '../../components/uploadFile/uploadFile.vue'
 import lFile from '../../components/l-file/l-file.vue'
@@ -531,15 +541,15 @@ import {
 import {
   getMode
 } from './utilForForm'
-import UserSelectByRole from "../userSelectByRole/userSelectByRole";
 import {downloadFile} from "../../utils/util";
 import XpPicker from "../xp-picker/xp-picker.vue";
+import signatrueWrite from "../signatrue-write/signatrue-write.vue";
 
 export default {
+  options: { styleIsolation: 'shared' },
   mixins: [computedMixin, validateFormMixin, pubSubMixin, valueChangeMixin],
   components: {
     'xp-picker': XpPicker,
-    UserSelectByRole,
     UniRate,
     tColorPicker,
     unploadFile,
@@ -548,11 +558,12 @@ export default {
     MyPicker,
     jinEdit,
     uniDatetimePicker,
-    richEditor
+    richEditor,
+    signatrueWrite
   },
   name: 'EvanFormItem',
   props: {
-    linkage: Object,
+    linkage: [Object,Array],
     formId: String,
     itemkey: [Number, String],
     models: [Object],
@@ -602,6 +613,9 @@ export default {
           }
           return '请选择'
         }
+        if (widget.options.type === 'week' ) {
+          return dataModel
+        }
         if (widget.type === 'date' && widget.options.format) {
           return moment(dataModel).format(widget.options.format)
         }
@@ -616,6 +630,7 @@ export default {
       return '请选择'
     }
   },
+  inject: ['dataObj'],
   data() {
     return {
       nameSign: '',
@@ -693,6 +708,22 @@ export default {
     uni.$off(this.widget.model);
   },
   methods: {
+    getAllComponent() {
+      const data = this.dataObj()
+      const findComponent = (list = []) => {
+        return list.reduce((all, curr) => {
+          if (Array.isArray(curr.columns)) {
+            all = all.concat(curr)
+            return all.concat(findComponent(curr.columns))
+          }
+          if (Array.isArray(curr)) {
+            return all.concat(findComponent(curr))
+          }
+          return all.concat(curr)
+        }, [])
+      }
+      return findComponent(data.list)
+    },
     getUploadFileUrl(widget) {
       let action = ''
       if (String(widget.options.action).startsWith('http')) {
@@ -749,17 +780,19 @@ export default {
       if (!value || !time) {
         callback()
       }
+      const comps = this.getAllComponent()
+      let target = comps.find(item => item.model == options.conditionValue)
       if (options.condition == '小于') {
         if (moment(value).unix() <= moment(time).unix()) {
           callback()
         } else {
-          callback("开始时间必须小于等于结束时间");
+          callback(`${this.widget.name}必须小于等于${target.name}`);
         }
       } else {
         if (moment(value).unix() >= moment(time).unix()) {
           callback()
         } else {
-          callback("开始时间必须小于等于结束时间");
+          callback(`${this.widget.name}必须大于等于${target.name}`);
         }
       }
     },
@@ -814,6 +847,7 @@ export default {
     },
     showTime(picker, index) {
       if (!picker || this.widget.options.disabled) return;
+      this.$refs[picker].value = Array.isArray(this.dataModel) ? this.dataModel[index] : this.dataModel
       this.$refs[picker].show(index);
     },
     //时间 日期清除
@@ -849,7 +883,8 @@ export default {
         SQL: widget.SQL,
         columnName: widget.columnName,
         columnCode: widget.columnCode,
-        apiUrl: widget.apiUrl
+        apiUrl: widget.apiUrl,
+        selectedCode:widget.labels
       }
       var PubsubSign = String(Math.random()).split('.')[1];
       Pubsub.subscribe(PubsubSign, (msg, data) => {
@@ -860,7 +895,7 @@ export default {
         // this.pulishMsg(data,true);//true代表用户点击
       })
       uni.navigateTo({
-        url: '/pages/picker/relateSub?params=' + JSON.stringify(params) + '&sign=' + PubsubSign +
+        url: '/pages/picker/relateSub?multiple=' + Number(widget.multiple) + '&params=' + JSON.stringify(params) + '&sign=' + PubsubSign +
             '&selectedData=' + JSON.stringify(this.dataModel ? this.dataModel : [])
       });
 
@@ -879,6 +914,7 @@ export default {
       if (this.widget.type === 'relateSub') {
         this.showLabels(this.dataModel)
       }
+
       if (['nameSignature', 'sealSignature'].some(item => this.widget.type.includes(item))) this.getUserSign()
     },
 
@@ -1006,12 +1042,19 @@ export default {
           if (this.widget.type == 'select') {
             let arr = res.result
             if (!Array.isArray(arr)) return;
+            let showLabel = ''
             for (let i = 0; i < arr.length; i++) {
+              if (Array.isArray(this.dataModel)) {
+                if (this.dataModel.includes(arr[i].dataKey)) {
+                  showLabel += ',' + arr[i].dataValue
+                }
+              }
               if (arr[i].dataKey == this.dataModel) {
                 this.dataModelShow = arr[i].dataValue
                 return
               }
             }
+            this.dataModelShow = showLabel.substring(1)
           } else if (this.widget.type == 'radio' || this.widget.type == 'checkbox') {
             this.updateRadioOrCheckboxModel(this.arrFindDictOrTable(res.result, 'dictTable'))
           }
@@ -1078,6 +1121,7 @@ export default {
       if (this.tableKey) {
         this.dataModel = this.models[this.tableKey][this.tableIndex][this.widget.model]
       } else {
+        const value = this.models[this.widget.model]
         if (this.widget.type === 'number') {
           if (this.models[this.widget.model]) {
             this.dataModel = this.models[this.widget.model]
@@ -1085,8 +1129,24 @@ export default {
             this.dataModel = this.widget.options.min
           }
           if (!this.dataModel) this.dataModel = 0
+        } else if (!value && this.widget.type === 'codeControl') {
+          const randomNum = String(Math.random())
+          const dateStr = String(new Date().getFullYear()).slice(2)
+              + (new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0' + (new Date().getMonth() + 1))
+              + (new Date().getDate() > 9 ? new Date().getDate() : '0' + new Date().getDate())
+              + randomNum.slice(-4)
+          this.dataModel = dateStr + ''
         } else {
-          this.dataModel = this.models[this.widget.model]
+          const { max, min } = this.widget.options
+          if (max && value > max) {
+            this.dataModel = max
+            return
+          }
+          if (min && value < min) {
+            this.dataModel = min
+            return
+          }
+          this.dataModel = value
         }
       }
     },
@@ -1122,6 +1182,7 @@ export default {
     },
     // 选择人员
     selectUser(flag) {
+
       if (this.widget.options.disabled) return
       this.isClickByUser = true
       var PubsubSign = 'SelectUser' + String(Math.random()).split('.')[1];
@@ -1147,7 +1208,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 = ""
@@ -1307,6 +1368,7 @@ export default {
           this.updatedeptSelectorModal()
         }
         if (this.widget.type === 'codeControl') {
+
           const randomNum = String(Math.random())
           const dateStr = String(new Date().getFullYear()).slice(2)
               + (new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0' + (new Date().getMonth() + 1))
@@ -1335,9 +1397,10 @@ export default {
 }
 </script>
 
-
-<style lang="scss" scoped>
+<style>
 @import "../../static/uni.css";
+</style>
+<style lang="scss" scoped>
 //.clear-btn {
 //  position: absolute;
 //  width: 31px;
@@ -1367,6 +1430,7 @@ icon {
 
 .disabledClick {
   pointer-events: none;
+  color: initial !important;
 }
 
 .cover-text {
@@ -1470,6 +1534,7 @@ checkbox-group label {
     .form-input {
       font-size: $uni-form-content-font-size;
       width: 100%;
+      min-height: 20px;
       color: #555555 // padding-left: 28upx;
     }
 
@@ -1599,4 +1664,7 @@ checkbox-group label {
 .option-time-icon {
   width: 150rpx;
 }
+::v-deep .uni-calendar__mask {
+  z-index: 999;
+}
 </style>

package/components/evan-form-item/mixins/pubSubMixin.js

@@ -51,6 +51,13 @@ export const pubSubMixin = {
 		updateModelByScript(data, list) {
 			this.isClickByUser = data.isClickByUser;
 			this.isWx = true
+			// #ifdef  H5
+			const that = this
+			let global=  globalThis
+			eval(data.operateValue)
+			return
+			// #endif
+
 			console.log(run(data.operateValue, {
 				that: this,
 				global: globalThis,
@@ -58,6 +65,7 @@ export const pubSubMixin = {
 				isWx: true,
 				uni
 			}))
+
 		},
 		/**
 		 * @description  发布消息

package/components/evan-form-item/utils.js

@@ -10,7 +10,11 @@ const utils = {
 		const propRules = [].concat(rules[prop] || []);
 		propRules.forEach((rule) => {
 			if (rule.pattern) {
-				rule.pattern = new RegExp(rule.pattern)
+				let pattern = rule.pattern
+				if (typeof pattern === 'string' && String(pattern).startsWith('/') && String(pattern).endsWith('/')) {
+					pattern = String(pattern).substring(1, pattern.length -1)
+				}
+				rule.pattern = new RegExp(pattern)
 			}
 		})
 		const descriptor = {

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

@@ -200,12 +200,20 @@ import Pubsub from 'pubsub-js'
 import evanFormItem from "../evan-form-item/evan-form-item";
 import evanForm from "../evan-form/evan-form";
 import mTextarea from "../m-textarea/m-textarea";
+import packageJson from '../../package.json'
+console.log('zhxy-app-component: ', packageJson.version)
 export default {
+  options: { styleIsolation: 'shared' },
     name: 'formContainer',
     props: ['dataObj', 'value', 'isButton', 'verifyNode', 'verifyLogs', 'suggest', 'isCorrect', 'isDraft', 'formId', 'linkage', "labelPosition",
         'isApply'
     ],
     components: { evanFormItem ,evanForm, mTextarea },
+    provide() {
+      return {
+        dataObj: () => this.dataObj
+      }
+    },
     data() {
         return {
             timer: null,
@@ -761,6 +769,7 @@ export default {
               fn('failed')
             } //['成功了', 'success']
           }).catch((error) => {
+            fn('failed')
             console.log(error)
           })
             // this.$refs.form.validate((res) => {
@@ -910,7 +919,7 @@ $mybottom: 0; //底部按钮
     .form-input {
         font-size: 28rpx;
         color: #333;
-        text-align: right;
+        //text-align: right;
         width: 100%;
         box-sizing: border-box;
         height: 60rpx;

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

@@ -3,11 +3,11 @@
 		<view class="file_conten">
 			<view class="file_upload option-font-size" @click="chooseMessageFile"
 				v-if="isShow">
-				点击上传
+			{{ widget.options.placeholder || '点击上传'}}
 			</view>
 			<view>
 				<view class="file_item" v-for="(item,idx) in defaultFile" :key="idx">
-					<view @click="downLoadFile(item.url,item.name)">{{item.name}}</view>
+					<view @click="downLoadFile(item.url,item.name)" style="max-width: 640rpx;color: rgb(0, 122, 255); overflow: hidden" :style="{maxWidth: disabled ? '100%': '640rpx'}">{{item.name}}</view>
 					<icon type="clear" size="16" @click="handleDelete(idx)" v-if="!disabled" />
 				</view>
 			</view>
@@ -50,6 +50,7 @@
 				name: "",
 				percent: 0,
 				show: true,
+        uploadIng: false,
 		    isShow:true,//是否展示点击上传
 			}
 		},
@@ -86,7 +87,20 @@
 			chooseMessageFile: function(e) {
 				console.log(this.widget, )
         const { options } = this.widget
-				if (this.disabled || (this.defaultFile.length && this.defaultFile.length >= options.length)) return false;
+
+				if (this.disabled || (this.defaultFile.length && this.defaultFile.length >= options.length)) {
+          this.uploadIng = false
+          return false;
+        }
+
+        if (this.uploadIng) {
+          uni.showToast({
+            title: `文件上传中`,
+            icon: 'none'
+          })
+          return
+        }
+        this.uploadIng = true
 				var that = this;
         //#ifdef H5
         uni.chooseFile
@@ -100,16 +114,27 @@
 					success: (res) => {
 						console.log(res.tempFiles)
 						const path = res.tempFiles
-            const { ext = '' } = this.widget
+            const { ext = '' , options } = this.widget
+            const { fileSize  } = options
 						that.name = res.tempFiles[0].name
+
             console.log(ext, that.name.split('.').pop())
             if (!ext.includes(that.name.split('.').pop())) {
+              that.uploadIng = false
               return uni.showToast({
                 title: `不支持该文件`,
                 icon: 'none'
               })
             }
+            if (res.tempFiles[0].size > fileSize * 1024) {
+              that.uploadIng = false
+              return uni.showToast({
+                title: `文件超出${fileSize}KB！`,
+                icon: 'none'
+              })
+            }
 
+            this.uploadIng = true
 						const uploadTask = uni.uploadFile({
 							url: that.url,
 							filePath: path[0].path,
@@ -123,9 +148,13 @@
 									url: JSON.parse(res.data).message
 								}
 								that.$emit('filePost', imgObj)
-							}
+							},
+              complete() {
+                that.uploadIng = false
+              }
 						});
 
+            that.show = true
 						uploadTask.onProgressUpdate(function(res) {
 							that.percent = res.progress;
 							if (Number(res.progress) == 100) {
@@ -133,7 +162,9 @@
 							}
 						});
 					},
+
 					error: function(e) {
+            that.uploadIng = false
 						console.log(e);
 					}
 				});
@@ -179,7 +210,7 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		view{
+		view {
 			margin-top: 10upx;
 		}
 	}

package/components/lb-picker/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view class="pick-name" @click="handleclick">{{title ? title : '请选择地区'}}</view>
+	<view style="width: 100%">
+		<view class="pick-name" @click="handleclick">{{title ? title : placeholder}}</view>
 		<!-- <uni-icons type="arrowdown" color="#D7d7d7" size="20" v-if="title =='' " @click="handleclick"></uni-icons> -->
 		<!-- 	<input type="text" placeholder="请选择" v-if="title =='' " @click="handleclick" /> -->
 		<uni-popup ref="popup" type="bottom">
@@ -53,6 +53,11 @@
 				type: Array,
 				default: []
 			},
+      placeholder:
+        {
+          type: String,
+          default: '请选择地区'
+        },
 			disabled: {
 				type: Boolean,
 				default: false
@@ -197,7 +202,7 @@
 			hadletwo(item, idx) {
 				this.indexthree = -1
 				this.indextwo = idx
-				if (item.isLeaf == false) {
+				if (item && item.isLeaf == false) {
 					this.getnext(item.value).then(res => {
 						console.log(res)
 						this.levellist = res.result
@@ -215,9 +220,11 @@
 				console.log(this.indexList)
 				const arr = this.indexList
 				this.svalue = arr
+        if (this.listtwo.length === 0) this.listtwo = [{value: '', label: ''}]
+        if (this.levellist.length === 0) this.levellist = [{value: '', label: ''}]
 				this.city = [this.list[arr[0]].value, this.listtwo[arr[1]].value, this.levellist[arr[2]].value]
-				this.title = this.list[arr[0]].label + '/' + this.listtwo[arr[1]].label + '/' + this.levellist[arr[2]]
-					.label
+				this.title = this.list[arr[0]].label + (this.listtwo[arr[1]].label ? ('/' + this.listtwo[arr[1]].label): '') + (this.levellist[arr[2]].label ? ('/' + this.levellist[arr[2]].label): '')
+
 				console.log('city', this.city)
 
 				this.$emit('change', this.city);
@@ -241,6 +248,8 @@
 	.pick-name {
 		font-size: 32rpx;
 		color: #555555;
+    width: 100%;
+    min-height: 14px;
 	}
 
 	.uni-padding-wrap {

package/components/rich-editor/index.vue

@@ -6,32 +6,32 @@
 		  字体图标，微信小程序官方的确没有给出名称
 		-->
 
-		<view class="toolbar" @touchend.stop="format" :style="'bottom: ' + (isIOS ? keyboardHeight : 0) + 'px'">
+		<view class="toolbar"  :style="'bottom: ' + (isIOS ? keyboardHeight : 0) + 'px'">
 			<!-- <i class="iconfont icon-charutupian" @touchend.stop="insertImage"></i> -->
 			<i :class="'iconfont icon-format-header-1 ' + (formats.header === 1 ? 'ql-active' : '')" data-name="header"
-			 :data-value="1"></i>
+			 :data-value="1" @click="format('header', 1)"></i>
 			<i :class="'iconfont icon-format-header-2 ' + (formats.header === 2 ? 'ql-active' : '')" data-name="header"
-			 :data-value="2"></i>
+			 :data-value="2"  @click="format('header', 2)"></i>
 			<i :class="'iconfont icon-format-header-3 ' + (formats.header === 3 ? 'ql-active' : '')" data-name="header"
-			 :data-value="3"></i>
+			 :data-value="3"  @click="format('header', 3)"></i>
 <!-- 			<i :class="'iconfont icon-format-header-4 ' + (formats.header === 4 ? 'ql-active' : '')" data-name="header"
 			 :data-value="4"></i>
 			<i :class="'iconfont icon-format-header-5 ' + (formats.header === 5 ? 'ql-active' : '')" data-name="header"
 			 :data-value="5"></i>
 			<i :class="'iconfont icon-format-header-6 ' + (formats.header === 6 ? 'ql-active' : '')" data-name="header"
 			 :data-value="6"></i> -->
-			<i :class="'iconfont icon-zitijiacu ' + (formats.bold ? 'ql-active' : '')" data-name="bold"></i>
+			<i :class="'iconfont icon-zitijiacu ' + (formats.bold ? 'ql-active' : '')" data-name="bold" @click="format('bold')"></i>
 <!--     <i :class="'iconfont icon-zitishanchuxian ' + (formats.strike ? 'ql-active' : '')" data-name="strike"></i>-->
-			<i :class="'iconfont icon-zitixieti ' + (formats.italic ? 'ql-active' : '')" data-name="italic"></i>
-			 <i :class="'iconfont icon-zitixiahuaxian ' + (formats.underline ? 'ql-active' : '')" data-name="underline"></i>
+			<i :class="'iconfont icon-zitixieti ' + (formats.italic ? 'ql-active' : '')" data-name="italic" @click="format('italic')"></i>
+			 <i :class="'iconfont icon-zitixiahuaxian ' + (formats.underline ? 'ql-active' : '')" data-name="underline" @click="format('underline')"></i>
 <!--      <i class="iconfont icon-fengexian" @tap="insertDivider"></i>-->
       <!-- <i class="iconfont icon--checklist" data-name="list" data-value="check"></i> -->
-			<i :class="'iconfont icon-zuoduiqi ' + (formats.align === 'left' ? 'ql-active' : '')" data-name="align" data-value="left"></i>
+			<i :class="'iconfont icon-zuoduiqi ' + (formats.align === 'left' ? 'ql-active' : '')" data-name="align" data-value="left" @click="format('align', 'left')"></i>
 			<i :class="'iconfont icon-juzhongduiqi ' + (formats.align === 'center' ? 'ql-active' : '')" data-name="align"
-			 data-value="center"></i>
-			<i :class="'iconfont icon-youduiqi ' + (formats.align === 'right' ? 'ql-active' : '')" data-name="align" data-value="right"></i>
+			 data-value="center" @click="format('align', 'center')"></i>
+			<i :class="'iconfont icon-youduiqi ' + (formats.align === 'right' ? 'ql-active' : '')" data-name="align" data-value="right" @click="format('align', 'right')"></i>
 			<i :class="'iconfont icon-zuoyouduiqi ' + (formats.align === 'justify' ? 'ql-active' : '')" data-name="align"
-			 data-value="justify"></i>
+			 data-value="justify"  @click="format('align', 'justify')"></i>
 			<!-- <i :class="'iconfont icon-line-height ' + (formats.lineHeight ? 'ql-active' : '')" data-name="lineHeight" data-value="2"></i> -->
 			<!-- <i :class="'iconfont icon-Character-Spacing ' + (formats.letterSpacing ? 'ql-active' : '')" data-name="letterSpacing"
 			 data-value="2em"></i> -->
@@ -51,8 +51,8 @@
 			<!-- <i class="iconfont icon-date" @tap="insertDate"></i> -->
 
 			<i :class="'iconfont icon-youxupailie ' + (formats.list === 'ordered' ? 'ql-active' : '')" data-name="list"
-			 data-value="ordered"></i>
-			<i :class="'iconfont icon-wuxupailie ' + (formats.list === 'bullet' ? 'ql-active' : '')" data-name="list" data-value="bullet"></i>
+			 data-value="ordered"  @click="format('list', 'ordered')"></i>
+			<i :class="'iconfont icon-wuxupailie ' + (formats.list === 'bullet' ? 'ql-active' : '')" data-name="list" data-value="bullet"   @click="format('list', 'bullet')"></i>
 <!-- 			<i class="iconfont icon-outdent" data-name="indent" data-value="-1"></i>
 			<i class="iconfont icon-indent" data-name="indent" data-value="+1"></i> -->
 			<!-- <i class="iconfont icon-preview" @tap="store" id="2"></i> -->
@@ -61,15 +61,15 @@
 			<i :class="'iconfont icon-zitishangbiao ' + (formats.script === 'super' ? 'ql-active' : '')" data-name="script"
 			 data-value="super"></i> -->
 <!--      <i class="iconfont icon-quanping"></i>-->
-			<i class="iconfont icon-undo" @tap="undo"></i>
-			<i class="iconfont icon-redo" @tap="redo"></i>
-			<i class="iconfont icon-shanchu" @tap="clear"></i>
+			<i class="iconfont icon-undo" @tap="undo"   @click="format('undo')"></i>
+			<i class="iconfont icon-redo" @tap="redo"  @click="format('redo')"></i>
+			<i class="iconfont icon-shanchu" @tap="clear" @click="format('clear')"></i>
 <!-- 			<i :class="'iconfont icon-direction-rtl ' + (formats.direction === 'rtl' ? 'ql-active' : '')" data-name="direction"
 			 data-value="rtl"></i> -->
 <!--			<i class="iconfont icon-baocun" @tap="store" id="1"></i>-->
 		</view>
 		<view class="container">
-			<editor id="editor" show-img-size :read-only="isEdit" show-img-resize show-img-toolbar class="ql-container"
+			<editor ref="editor" id="editor" show-img-size :read-only="isEdit" show-img-resize show-img-toolbar class="ql-container"
 			 :placeholder="placeholder" @statuschange="onStatusChange" @ready="onEditorReady" @input="handleInput">
 			</editor>
       <view v-if="maxLength" class="text-num">{{textLength}}/{{maxLength}}</view>
@@ -148,6 +148,11 @@
           console.log(this.editorCtx, res)
           this.editorCtx.setContents({
             html: this.value
+          })
+          this.editorCtx.getContents({
+            success: (res) => {
+              this.textLength = res.text.replaceAll(`\n`,"").length
+            },
           })
 				}).exec();
 			},
@@ -233,12 +238,8 @@
         // })
       },
 
-			format(e) {
+			format(name, value) {
 				// this.hideKey();
-				let {
-					name,
-					value
-				} = e.target.dataset;
 				if (!name) return; // console.log('format', name, value)
 				this.editorCtx.format(name, value);
 			},

package/components/signatrue-write/signatrue-write.vue

@@ -50,12 +50,18 @@
 		methods: {
 			overSign: function() {
 				if (this.isEnd) {
+          let url = ''
+          if (String(this.uniEnv.uploadUrl).startsWith('http')) {
+            url = this.uniEnv.uploadUrl;
+          } else {
+            url = this.uniEnv.uploadUrl.includes('sys/common/upload') ? this.uniEnv.uploadUrl : (this.uniEnv.uploadUrl + '/sys/common/upload')
+          }
 					uni.canvasToTempFilePath({
 						canvasId: 'firstCanvas',
 						fileType: 'png',
 						success: (res)  => {
 							uni.uploadFile({
-								url: this.uniEnv.uploadUrl+'/sys/common/upload',
+								url,
 								filePath: res.tempFilePath,
 								name: 'file',
 								success: (uploadFileRes) => {

package/components/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

@@ -676,8 +676,14 @@
 				this.cale.setMultiple(this.calendar.fullDate, true)
 				this.weeks = this.cale.weeks
 				this.tempSingleDate = this.calendar.fullDate
+        if (new Date(this.cale.multipleStatus.before) > new Date(this.cale.multipleStatus.after)) {
+          let temp = this.cale.multipleStatus.before
+          this.cale.multipleStatus.before = this.cale.multipleStatus.after
+          this.cale.multipleStatus.after = temp
+        }
 				this.tempRange.before = this.cale.multipleStatus.before
 				this.tempRange.after = this.cale.multipleStatus.after
+
 				console.log('多选')
 				console.log(this.calendar.fullDate)
 				console.log(this.cale)

package/components/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -959,7 +959,7 @@
 		width: 55rpx;
 		height: 55rpx;
 		line-height: 55rpx;
-		z-index: 80;
+		z-index: 10;
 		top: 0;
 		right: 0px;
 	}

package/components/uploadFile/uploadFile.vue

@@ -1,11 +1,21 @@
 <template>
   <view>
-    <u-upload ref="uUpload" :file-list="fileList" :action="action"
+    <u-upload ref="uUpload" :file-list="fileList" :action="action" :deletable="!disabled"
               @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>
+              :upload-text="widget.options.placeholder"
+              width="150" height="150" :multiple="false" :max-count="maxCount" :disabled="disabled"
+              @on-remove="onRemove" @on-oversize="onOversize" @on-success="onSuccess"
+              :show-progress="showProgress">
+
+      <template name="addbtn">
+        <view class="u-list-item u-add-wrap" hover-class="u-add-wrap__hover" hover-stay-time="150" @click.stop="handleClick">
+          <u-icon name="plus"  size="40"></u-icon>
+          <view class="u-add-tips">{{ '上传' }}</view>
+        </view>
+      </template>
+    </u-upload>
+
     <!-- uview组件 修改了 disabled 用法 更新需要注意 -->
   </view>
 </template>
@@ -34,11 +44,11 @@ export default {
       percent: 0,
       upimg: '',
       maxCount: 8,
-      maxSize: 300000,
       disabled: false,
       show: true,
       fileList: [],
-      emitList:[],
+      emitList: [],
+      uploadIng: false,
       showProgress: true
     };
   },
@@ -54,14 +64,48 @@ export default {
   },
 
   methods: {
+
+    handleClick() {
+      if (this.uploadIng) {
+        return uni.showToast({
+          title: `文件上传中`,
+          icon: 'none'
+        })
+      }
+      if (this.$refs.uUpload.selectFile) this.$refs.uUpload.selectFile()
+      if (this.$refs.uUpload.chooseFile) this.$refs.uUpload.chooseFile()
+    },
     async afterRead(event) {
-      const { ext = '' }  = this.widget
+      const {ext = '', options} = this.widget
+      const { fileSize, length } = options
+
       if (!ext.includes(event.name.split('.').pop())) {
         return uni.showToast({
           title: `不支持该文件`,
           icon: 'none'
         })
       }
+      if (event.file.size > this.maxSize) {
+        return uni.showToast({
+          title: `文件超出${this.maxSize/1024}KB！`,
+          icon: 'none'
+        })
+      }
+      if (this.fileList.length >= this.maxCount)  {
+        return uni.showToast({
+          title: `最多上传${this.maxCount}个文件！`,
+          icon: 'none'
+        })
+      }
+
+      if (this.uploadIng) {
+        return uni.showToast({
+          title: `文件上传中`,
+          icon: 'none'
+        })
+      }
+      this.uploadIng = true
+
       // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
       let lists = [].concat(event.file)
       // lists.map((item) => {
@@ -77,12 +121,13 @@ export default {
         const item = {
           key: id,
           uid: id,
-          url:  result,
+          url: result,
           status: "done",
           name: id
         }
         this.emitList.push(item)
         this.fileList.push(Object.assign({}, item, {url: this.uniEnv.imgUrl + item.url}))
+        this.uploadIng = false
         this.$emit('imgUrlPost', this.emitList)
       }
     },
@@ -95,24 +140,30 @@ export default {
           success: (uploadFileRes) => {
             const res = JSON.parse(uploadFileRes.data)
             resolve(res.message)
-          }
+          },
+          complete: () => {
+            setTimeout(() => {
+              this.uploadIng = false
+            }, 1000)
+          },
         });
       })
     },
-    onOversize(val, lists, index){
-      // uni.showToast({
-      // 	title: '超出允许的文件大小',
-      // 	icon: 'none',
-      // 	duration: 2000
-      // });
+    onOversize() {
+      uni.showToast({
+        title: `文件超出${this.maxSize/1024}KB！`,
+        icon: 'none',
+        duration: 1000
+      });
     },
     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,
+            .map((item, index) => {
+              let tempItem = {
+                ...item,
               };
               tempItem.url = this.uniEnv.imgUrl + tempItem.url;
               return tempItem;
@@ -129,7 +180,7 @@ export default {
         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 = this.widget.options.fileSize ? this.widget.options.fileSize * 1024 : 300000;
 
       // this.maxSize = 100
       //最大上传个数
@@ -165,7 +216,7 @@ export default {
       this.$emit('imgUrlPost', this.emitList)
     },
     onRemove(index, lists, name) {
-      if (typeof(index) === 'object') index = index.index
+      if (typeof (index) === 'object') index = index.index
       this.emitList.splice(index, 1);
       this.fileList.splice(index, 1);
       this.$emit('imgUrlPost', this.emitList)
@@ -175,4 +226,35 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.u-list-item {
+  width: 200rpx;
+  height: 200rpx;
+  overflow: hidden;
+  margin: 10rpx;
+  background: rgb(244, 245, 246);
+  position: relative;
+  border-radius: 10rpx;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  align-items: center;
+  justify-content: center;
+}
+
+.u-preview-wrap {
+  border: 1px solid rgb(235, 236, 238);
+}
+
+.u-add-wrap {
+  flex-direction: column;
+  font-size: 26rpx;
+}
+.u-add-tips {
+  margin-top: 20rpx;
+  line-height: 40rpx;
+}
+
+.u-add-wrap__hover {
+  background-color: rgb(235, 236, 238);
+}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.93",
+	"version": "1.0.94",
 	"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 sconsttyle="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>