@zscreate/zhxy-app-component 1.0.105 → 1.0.106

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

@@ -508,7 +508,25 @@
       </view>
     </view>
 
+    <!-- location 定位  -->
+    <view v-if="widget.type ==='location'" class="evan-form-item-container" :class="'evan-form-item-container--top'"
+          :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">
+        <view class="location-form-item">
+          <view class="form-input cover-text" >
+            <view class="address">{{ dataModel }}</view>
+            <view @click="openDZWT" v-if="!widget.options.disabled && widget.options.enableDZWT && dataModel" style="color: #6f9bdd">地址微调</view>
+          </view>
+          <u-button type="primary" size="mini" v-if="!widget.options.disabled" @click="handleLocation">{{ widget.options.buttonText }}</u-button>
+        </view>
+        </view>
+    </view>
     <view class="error-message" v-if="showFalse">{{ showFalseMsg }}</view>
+    <u-toast ref="uToast" />
   </view>
 </template>
 
@@ -544,6 +562,7 @@ import {
 import {downloadFile} from "../../utils/util";
 import XpPicker from "../xp-picker/xp-picker.vue";
 import signatrueWrite from "../signatrue-write/signatrue-write.vue";
+import {toAwait} from "../../common/util";
 
 export default {
   options: { styleIsolation: 'shared' },
@@ -652,7 +671,8 @@ export default {
       actionUrl: this.uniEnv.uploadUrl,
       correntArray: ['input', 'textarea'],
       checkboxAndRadioOptions: [],
-      selectedData: []
+      selectedData: [],
+      locationInfo: {},
     }
   },
   mounted() {
@@ -1348,7 +1368,62 @@ export default {
     getBase64(base64) {
       this.signatrueImage = this.dataModel = base64
       this.signatrueFlag = false
-    }
+    },
+    // 合并代码之定位
+    location() {
+      uni.showLoading({
+        title: "定位中",
+      });
+      uni.getLocation({
+        type: "gcj02", //返回可以用于uni.openLocation的经纬度
+        isHighAccuracy: this.widget.options.isHighAccuracy,
+        highAccuracyExpireTime: this.widget.options.timeout,
+        success: async (result) => {
+          console.log(result);
+          const { longitude: lng, latitude: lat } = result;
+          this.locationInfo = result;
+          const [err, res] = await toAwait(
+            this.$u.get("/form/formdesiger/getLocalDetail", { lat, lng })
+          );
+          uni.hideLoading();
+          if (err || !res.success) {
+            this.$refs.uToast.show({
+              title: "地址获取失败",
+              duration: 2000,
+            });
+            return;
+          }
+          const { address, formatted_addresses = {} } = res.result;
+          const { recommend = "", rough = "" } = formatted_addresses;
+          this.dataModel = recommend || rough || address;
+        },
+        fail: (err) => {
+          console.log(err);
+          uni.hideLoading();
+          const { errMsg } = err;
+          if (errMsg.includes("system permission denied")) {
+            this.$refs.uToast.show({
+              title: "微信无定位权限,请在手机设置中开启",
+              duration: 2000,
+            });
+            return;
+          }
+          if (errMsg.includes("LOCATIONSWITCHOFF")) {
+            this.$refs.uToast.show({
+              title: "手机定位未开启,请在手机设置中开启",
+              duration: 2000,
+            });
+            return;
+          }
+
+          this.$refs.uToast.show({
+            title: "小程序获取定位失败",
+            duration: 2000,
+          });
+          console.log(err);
+        },
+      });
+    },
   },
   watch: {
     models: {
@@ -1678,4 +1753,20 @@ checkbox-group label {
 ::v-deep .uni-calendar__mask {
   z-index: 999;
 }
+.location-form-item {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 10rpx 10rpx 10rpx 0;
+  .address {
+    font-size: 32rpx;
+    width: 100%;
+    color: #555;
+  }
+  u-button {
+    flex: auto 0 0;
+    margin: 0 10rpx;
+  }
+}
 </style>

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

@@ -302,7 +302,15 @@ export default {
             immediate: true
         },
         suggest(v) {
-            this.selectList = v
+            this.selectList = v;
+            const item = this.dataObj.list.find(obj => obj.model === this.verifyNode)
+            if (item
+                && !this.models[this.verifyNode].operation
+                && item.options.operationChooseFirst) {
+            this.models[this.verifyNode].operation = this.suggestType = this.suggest[0]
+                ? this.suggest[0].value
+                : "";
+            }
         },
         // linkage:{
         // 	deep: true,
@@ -786,7 +794,25 @@ export default {
                     }
                 }
                 // console.log(promiseArr)
-
+                // 校验审核表单
+                promiseArr.push(new Promise((resolve, reject) => {
+                    const item = this.models[this.verifyNode]
+                    const widget = this.dataObj.list.find(obj => obj.model === this.verifyNode)
+                    if (item && widget) {
+                    const rules = {
+                        comments: [{ required: widget.options.opinionRequire, message: '请输入审批意见' }]
+                    }
+                    utils.validateField(item, rules , Object.keys(rules), (success, errors) => {
+                        if (success) {
+                        resolve()
+                        } else {
+                        reject(errors)
+                        }
+                    },{
+                        showMessage: true
+                    })
+                    }
+                }))
             }
           Promise.all(promiseArr).then((result) => {
             console.log(result, promiseArr.length)

package/package.json

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

package/utils/util.js

@@ -176,10 +176,18 @@ function downloadFile(downLoadUrl, { path, name }) {
 	})
 }
 
+/**
+ * async...await 优雅的处理错误方法
+ * @param promise
+ * @returns {*}
+ */
+const toAwait = promise => promise.then( res => [null, res ]).catch(error => [error])
+
 module.exports = {
 	formatTime: formatTime,
 	formatLocation: formatLocation,
 	dateUtils: dateUtils,
+	toAwait,
 	cloneObj: cloneObj,
 	_debounce:_debounce,
 	downloadFile