@zscreate/zhxy-app-component 1.0.214 → 1.0.216

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

@@ -2,11 +2,11 @@
   <view class="form-item"
     :class="{ showFalse: showFalse, isScroll: isScroll, isCorrected: widget.options.isCorrected ? true : false }"
     @click="resetShowFalse">
-    <view v-if="widget.options.isCorrected" class="correctedWrap">
-      原值是： {{ widget.options.oldValue }}
+    <view v-if="widget.options.isCorrected" class="editCorrent correctedWrap"  >
+      <view @click.native="CorrentItem">原值是： {{ correctOldValue(widget.options.oldValue) }}</view>
     </view>
     <view class="editCorrent"
-      v-if="isCorrect && widget.options.canCorrect"
+      v-else-if="isCorrect && widget.options.canCorrect"
       @click.stop="CorrentItem">
       <!-- ===undefined兼容老版本表单 -->
       <text style="color: #4480E3">纠错</text>
@@ -65,7 +65,7 @@
         </view>
 				<textarea v-else maxlength="9999999" class="form-input cover-text" v-model="dataModel"
                   :style="{ height: (widget.options.height || 100) * 2 + 'px'}"
-                  placeholder-style="line-height:60rpx" placeholder-class="form-input-placeholder"
+                   placeholder-class="form-input-placeholder"
                   :placeholder="widget.options.placeholder" :disabled="widget.options.disabled">
 				</textarea>
       </view>
@@ -261,7 +261,7 @@
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle">
-        <unploadFile :widget="widget" :action="getUploadFileUrl(widget)" @filePost="filePost" @fileDelete="fileDelete"
+        <unploadFile :widget="widget" ref="imgUpload" :action="getUploadFileUrl(widget)" @filePost="filePost" @fileDelete="fileDelete"
           :defaultImg="dataModel"></unploadFile>
       </view>
     </view>
@@ -301,7 +301,7 @@
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle">
-        <lb-picker style="width: 100%" :placeholder="widget.options.placeholder" ref="picker" v-model="dataModel"
+        <lb-picker style="width: 100%" :placeholder="widget.options.placeholder" ref="lb_picker" v-model="dataModel"
           @change="cityChecked" :value="widget.options.defaultValue" :disabled="widget.options.disabled">
         </lb-picker>
       </view>
@@ -722,6 +722,7 @@ export default {
       checkboxAndRadioOptions: [],
       selectedData: [],
       locationInfo: {},
+      correctObj: undefined
     }
   },
   mounted() {
@@ -781,6 +782,15 @@ export default {
     uni.$off(this.widget.model);
   },
   methods: {
+    correctOldValue(oldValue) {
+      const type = this.widget.type
+      if (Array.isArray(oldValue) && oldValue.length === 0) return '【空】'
+      if (type === 'switch') return Boolean(oldValue) ? 'true' : 'false'
+      if (type === 'slider') return Number(oldValue || 0)
+
+      const res = ['', undefined, null].includes(oldValue) ? '【空】': oldValue
+      return res.length > 10 ? res.substring(0, 10) + '...' : res
+    },
     numberBoxPlus(e) {
       console.log(e, this.dataModel);
       this.dataModel = this.widget.options.step ?  e.value + this.widget.options.step : e.value + 1
@@ -1067,13 +1077,105 @@ export default {
       getApp().globalData.correntFormData
       getApp().globalData.correntWidget = {
         ...this.widget,
-        dataModel: this.dataModel
+        dataModel: this.dataModel,
+        correctInfo: {
+          isSubTable: this.tableKey ? 1 : 0, //是否纠错子表单 0否 1是
+          subTableCode: this.tableKey, //新增纠错子表名
+          correctIndex: this.tableIndex, //新增纠错索引
+        },
+        setCorrectData: (correctObj)  => {
+          const { oldValue: oldVal, newDataObj: newVal  }  = correctObj
+          this.correctObj = correctObj
+          console.log('setCorrectData', correctObj)
+          if (['checkbox', 'radio'].includes(this.widget.type)) {
+            correctObj.dictOptions = this.checkboxAndRadioOptions
+          }
+          this.setCorrectStatus(correctObj)
+
+          // const options = this.widget.options
+          this.dataModel = newVal
+          // if (!options.isCorrected) {
+          //   this.$set(this.widget.options, 'isCorrected', true)
+          //   this.widget.options.oldValue = oldVal
+          // }
+          setTimeout(() => {
+            if (this.widget.type === 'imgupload') this.$refs.imgUpload.showImage()
+          }, 0)
+        },
       }
       console.log(getApp().globalData.correntWidget)
-      Pubsub.subscribe('corrent_item', (msg) => {
-        console.log(msg)
+      Pubsub.publish('correct_item', {
+        originData: getApp().globalData.correntWidget,
+        correctObj: this.correctObj
       })
-      Pubsub.publish('corrent_item', getApp().globalData.correntWidget)
+    },
+    setCorrectStatus(correctObj) {
+      try {
+        if (this.widget.options.oldValue === undefined) {
+          // 如果当前oldValue为undefined，说明是第一次纠错，需要保存一下oldValue；之后oldValue值不变
+          let oldValue = this.tableKey
+              ? this.models[this.tableKey][this.tableIndex][this.widget.model]
+              : this.models[this.widget.model];
+
+          if (correctObj.oldValue) oldValue = correctObj.oldValue
+          // 获取select radio select 字典信息
+          const dictOptions = correctObj.dictOptions
+
+          const  getOldValue = (oldValue, keyName) =>  {
+            if (!Array.isArray(oldValue)) return ""
+            return Array.isArray(oldValue) ? oldValue.reduce((i, j) => j[keyName] + "," + i, "").slice(0, -1) : ""
+          }
+
+          const getDictValue = (oldValue) => {
+            if (!Array.isArray(oldValue)) {
+              const findItem = dictOptions.find( item => item.value === oldValue)
+              if (findItem) {
+                return findItem.text || findItem.label
+              }
+            }
+            if (!Array.isArray(oldValue)) return ""
+            return oldValue.reduce((i, j) => {
+              const findItem = dictOptions.find( item => item.value === j)
+              if (findItem) return (findItem['text'] || findItem['label']) + "," + i
+            }, "").slice(0, -1)
+          }
+          if (oldValue) {
+            switch (this.widget.type) {
+              case "cascader":
+                oldValue = correctObj.cascaderLabel
+                break;
+              case "userSelectorByRole":
+              case "userSelector":
+                oldValue = Array.isArray(oldValue) ? oldValue.reduce((i, j) => i + " " + (j.realname || j.username), "") : ""
+                break
+              case 'time':
+                oldValue = Array.isArray(oldValue) ? oldValue.reduce((i, j) => i + " " + j, '') : oldValue
+                break
+              case 'radio':
+              case 'checkbox':
+              case "select":
+                oldValue = getDictValue(oldValue)
+                break
+              case "imgupload":
+              case "fileupload":
+                oldValue = getOldValue(correctObj['oldValue'], 'name')
+                break
+              case "deptSelector":
+                oldValue = getOldValue(oldValue, 'departName')
+                break
+            }
+          }
+          console.log(oldValue)
+          this.$set(this.widget.options, "oldValue", oldValue);
+        }
+        this.$set(this.widget.options, "isCorrected", true);
+        // this.updateModels(correctObj.newDataObj);
+      } catch (err) {
+        console.log(err);
+      } finally {
+        correctObj.dictOptions = []
+        correctObj.cascaderLabel = undefined
+      }
     },
     /****更新*userSelector**/
     updateUserSelectorModal() {
@@ -1681,6 +1783,12 @@ export default {
         if (this.widget.type === 'deptSelector') {
           this.updatedeptSelectorModal()
         }
+        if (['select', 'radio', 'checkbox'].includes(this.widget.type) ) {
+          this.updatedSelectModal()
+        }
+        if (this.widget.type === 'userSelectorByRole' ) {
+          this.handleSelectRoleUserOk(v)
+        }
         if (this.widget.type === 'number') {
           const { max, min } = this.widget.options
           if ((max || max === 0) && v > max) {
@@ -2061,5 +2169,9 @@ checkbox-group label {
 .uni-list-cell::after {
   z-index: 0 !important;
 }
+
+::v-deep .uni-slider-thumb  {
+  z-index: 1;
+}
 </style>
 

package/components/lb-picker/index.vue

@@ -87,14 +87,17 @@
 			this.getEcho()
 		},
 		watch: {
-			value(v) {
-				console.log('vvv', v)
+			value(oldVal,newVal) {
+        if (JSON.stringify(oldVal) !== JSON.stringify(newVal)) {
+          this.getdata(this.list, 0)
+        }
+        // this.bindChange({ detail: {value: v}})
+        // this.handleOk()
 			}
 		},
 		methods: {
 			bindChange: function(e) {
 				const val = e.detail.value
-				console.log(1)
 				if (val[0] != this.indexList[0]) {
 					this.indexList[0] = val[0];
 					this.indexList[1] = 0;
@@ -129,6 +132,7 @@
 			 * @param {Number} xindex 第几级数据
 			 * **/
 			async getdata(list, xindex) {
+        if (xindex === 0) this.cityLabel = []
 				if (xindex > this.value.length-1) return;
 				for (var j = 0; j < list.length; j++) {
 					if (list[j].value == this.value[xindex]) {
@@ -149,13 +153,24 @@
 			},
 			//获得一级
 			init() {
-				return this.$u.get('/sys/dict/listProvince')
+        return new Promise(resolve => {
+          if (Vue.prototype.data_listProvince) return resolve(Vue.prototype.data_listProvince)
+          this.$u.get('/sys/dict/listProvince').then( res => {
+            Vue.prototype.data_listProvince = res
+            resolve(res)
+          })
+        })
 			},
 			//请求下级
 			getnext(id) {
-				return this.$u.get('/sys/dict/listAreaByCode', {
-					code: id
-				})
+        if (!Vue.prototype.data_listAreaByCode) Vue.prototype.data_listAreaByCode = {}
+        return new Promise(resolve => {
+          if (Vue.prototype.data_listAreaByCode[id]) return resolve(Vue.prototype.data_listAreaByCode[id])
+          this.$u.get('/sys/dict/listAreaByCode', {code: id}).then( res => {
+            Vue.prototype.data_listAreaByCode[id] = res
+            resolve(res)
+          })
+        })
 			},
 			handleclick() {
 				if (this.disabled) return false;

package/components/uploadFile/uploadFile.vue

@@ -85,7 +85,6 @@ export default {
   },
 
   methods: {
-
     handleClick() {
       if (this.uploadIng) {
         return uni.showToast({
@@ -196,23 +195,27 @@ export default {
       });
     },
     showImage() {
-      this.emitList = cloneObj(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;
-              if (tempItem.fileId) {
-                tempItem.url = (this.uniEnv.BASE_API || this.uniEnv.apiUrl) + `/sys/common/downloadZip?fileId=${tempItem.fileId}&openId=${this.openId}&token=${this.header['X-Access-Token']}`
-              }
-              return tempItem;
-            })
+      this.$nextTick(() => {
+          this.$refs.uUpload.lists = []
+          this.fileList = []
+          this.emitList = cloneObj(this.defaultImg || [])
+          this.showProgress = false;
+          if (this.emitList && this.emitList.length && this.emitList.length > 0) {
 
-        console.log(this.fileList)
-      }
+            this.fileList = this.emitList
+                .map((item, index) => {
+                  let tempItem = {
+                    ...item,
+                  };
+                  tempItem.url = this.uniEnv.imgUrl + tempItem.url;
+                  if (tempItem.fileId) {
+                    tempItem.url = (this.uniEnv.BASE_API || this.uniEnv.apiUrl) + `/sys/common/downloadZip?fileId=${tempItem.fileId}&openId=${this.openId}&token=${this.header['X-Access-Token']}`
+                  }
+                  return tempItem;
+                })
+            console.log('fileList:', this.fileList)
+          }
+      })
     },
     initWidget() {
       //action url
@@ -313,4 +316,7 @@ export default {
 .u-add-wrap__hover {
   background-color: rgb(235, 236, 238);
 }
+/deep/ .u-delete-icon {
+  z-index: 1;
+}
 </style>

package/components/userSelectByRole/userSelectByRole.vue

@@ -31,8 +31,11 @@
           <u-tr v-for="user in roleUserList" :key="user.id">
             <u-td width="50px" >
               <view style="min-width: 33px;">
-                <u-checkbox v-model="user.checked" @change="handleCheck" :name="user.id"  >
+                <u-checkbox v-model="user.checked" @change="handleCheck" :name="user.id"  v-if="multiple">
                 </u-checkbox>
+                <u-radio-group v-model="radioItem"  v-else>
+                  <u-radio  @change="handleCheckRadio" :name="user.id" class="table-radio"></u-radio>
+                </u-radio-group>
               </view>
             </u-td>
             <u-td style="flex: 1"><view>{{ user.realname }}</view></u-td>
@@ -60,6 +63,7 @@ export default {
   data() {
     return {
       roleSelectShow: false,
+      radioItem: '',
       rolesList: [],
       roleUserList: [],
       currValue: [],
@@ -102,6 +106,7 @@ export default {
       this.role = widget.options.role
       this.multiple = widget.options.multiple
       this.currValue = cloneObj(value || [])
+      if(!this.multiple) this.radioItem = this.currValue[0].id
       this.$u.get('/sys/role/list', {
         pageNo: 1,
         pageSize: 100000,
@@ -122,6 +127,17 @@ export default {
         return item.checked
       }).length === len
     },
+    handleCheckRadio(e) {
+      this.radioItem = e
+      console.log(e,this.radioItem)
+      this.roleUserList.forEach(item => item.checked = false)
+      this.roleUserList.forEach(item => {
+        if(item.id === e) {
+          item.checked =  true
+          this.currValue = [item]
+        }
+      })
+    },
     handleCheck({value , name}) {
       console.log(value, name)
       if (!this.multiple) {
@@ -215,6 +231,9 @@ export default {
 /deep/ .u-checkbox__label {
   display: none !important;
 }
+/deep/ .table-radio .u-radio__label {
+  display: none !important;
+}
 .role-select-body {
   display: flex;
   flex-direction: column;

package/package.json

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