优化

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -110,7 +110,7 @@
     });
     // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
     // 'inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0'
-    SM('inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0').then((ress1) => {
+    SM().then((ress1) => {
       let postData = {
         code: ress1,
         taskId: data.id,

pages/inspection/inspectionValue/inspectionValue.vue

@@ -4,20 +4,40 @@
       <uni-forms ref="baseForm" :model="formValues" :rules="rules" class="form" label-position="top">
         <template v-for="(item, index) of baseFormData" :key="index">
           <!-- 下拉 -->
-          <uni-forms-item v-if="item.type === '1'" class="formItem" :label="item.name" :exception="item.isException" :required="item.required" :name="item.key">
+          <uni-forms-item v-if="item.type === '1'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
             <uni-data-picker :placeholder="'请选择' + item.name" :popup-title="'请选择' + item.name" :localdata="item.list" v-model="formValues[item.key]" @change="changeForm()">
             </uni-data-picker>
           </uni-forms-item>
           <!-- 单选 -->
-          <uni-forms-item v-if="item.type === '2'" class="formItem" :label="item.name" :exception="item.isException" :required="item.required" :name="item.key">
+          <uni-forms-item v-if="item.type === '2'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
             <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" :localdata="item.list" />
           </uni-forms-item>
           <!-- 多选 -->
-          <uni-forms-item v-if="item.type === '3'" class="formItem" :label="item.name" :exception="item.isException" :required="item.required" :name="item.key">
+          <uni-forms-item v-if="item.type === '3'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
             <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" multiple :localdata="item.list" />
           </uni-forms-item>
           <!-- 数字 -->
-          <uni-forms-item v-if="item.type === '4'" class="formItem" :label="item.name" :exception="item.isException" :required="item.required" :name="item.key">
+          <uni-forms-item v-if="item.type === '4'" class="formItem" :required="item.required" :name="item.key">
+            <template v-slot:label>
+              <view class="customLabelWrap">
+                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+              </view>
+            </template>
             <uni-number-box v-model="formValues[item.key]" @change="changeForm()" :min="-9999" :max="9999" :placeholder="'请输入' + item.name"></uni-number-box>
           </uni-forms-item>
           <!-- 单行 -->
@@ -68,24 +88,24 @@ import { forIn } from 'lodash-es';
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
-  
+
   // 所有页码数据
   const formPageList = reactive([]);
-  
+
   // 表单
   const baseForm = ref()
-  
+
   const inspectionExecuteId = ref()
 
   // 数据-原始
   const dataInfo = reactive({})
-  
+
   // 数据-检验
   const rules = reactive({})
-  
+
   // 数据-填写值
   const formValues = reactive({})
-  
+
   // 表单数据-渲染
   // 下拉框	1
   // 单选	2
@@ -104,12 +124,12 @@ import { forIn } from 'lodash-es';
     // { type: 6, name: '', value: '', list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
     // { type: 7, name: '', value: [], list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
   ])
-  
+
   // 修改
   function changeForm(){
     handleData(true);
   }
-  
+
   // 保存
   function submit(){
     baseForm.value.validate().then(res => {
@@ -165,18 +185,18 @@ import { forIn } from 'lodash-es';
       console.log('err', err);
     })
   }
-  
+
   // 处理数据
   function handleData(isException = false){
     // 目前只取第一页
     let firstPage = formPageList[0]?.formItemList || [];
-    
+
     firstPage = firstPage.filter( v => v.display === 1);
-    
+
     firstPage = firstPage.map((v, i) => {
       let value = '';
       v.formItemConfigList = v.formItemConfigList || [];
-      
+
       // value
       if(v.type.value === '3'){
         // 多选
@@ -195,7 +215,7 @@ import { forIn } from 'lodash-es';
         // 其他
         value = v.defaultValue;
       }
-      
+
       return {
         id: v.id,
         key: `field${i}`,
@@ -211,10 +231,10 @@ import { forIn } from 'lodash-es';
         valueMax: v.checkType === 2 ? v.valueUp : ( v.checkType === 1 ? (v.valuex + v.valueGap) : undefined),
       }
     });
-    
+
     let firstPageBottom = firstPage.filter(v => v.type === '5' || v.type === '6');
     firstPage = firstPage.filter(v => v.type !== '5' && v.type !== '6' && v.type !== '7');
-    
+
     // 其他项
     if(isException){
       firstPage.forEach(v => {
@@ -256,7 +276,7 @@ import { forIn } from 'lodash-es';
         }
       })
     }
-    
+
     // 单行|多行|图片上传
     let someIsException = firstPage.filter(v => v.type !== '8').some(v => v.isException);
     console.log('someIsException=>', someIsException)
@@ -264,19 +284,19 @@ import { forIn } from 'lodash-es';
       console.log('v.showError=>', v.showError)
       v.isException = (v.showError === 1 && someIsException) || v.showError === 0;
     })
-    
+
     firstPage = firstPage.concat(firstPageBottom).sort((a, b) => a.orders - b.orders);
     console.log('firstPage=>', firstPage);
-    
+
     Object.assign(baseFormData, firstPage);
     console.log('baseFormData=>', baseFormData);
-    
+
     Object.assign(formValues, fromPairs(firstPage.filter(v => v.type !== '8').map(v => ([v.key, v.value]))));
     console.log('formValues=>', formValues);
-    
+
     let rulesObj = keyBy(firstPage.filter(v => v.type !== '8'), 'key');
     console.log(rulesObj)
-    
+
     for(let key in rulesObj){
       rulesObj[key] = {
         rules: [
@@ -287,7 +307,7 @@ import { forIn } from 'lodash-es';
     Object.assign(rules, rulesObj);
     console.log('rules=>', rules);
   }
-  
+
   onLoad((option) => {
     inspectionExecuteId.value = +option.inspectionExecuteId;
     // 巡检项

readme.md

@@ -9,4 +9,3 @@
 - filters      存放过滤器
 
 # uni-ui源码修改记录
-- uni-forms-item.vue增加exception参数

static/scss/common.scss

@@ -9,6 +9,26 @@ page{
   color:red!important;
 }
 
+.customLabelWrap{
+  display: flex;
+}
+
+.customLabel{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  text-align: left;
+  font-size: 14px;
+  color: #606266;
+  height: 36px;
+  padding: 0 12px 0 0;
+  vertical-align: middle;
+  flex-shrink: 0;
+  box-sizing: border-box;
+  padding: 0 0 8px;
+  line-height: 1.5715;
+}
+
 uni-toast,
 [longpressactions]{
   z-index: 99999!important;

uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue

@@ -6,7 +6,6 @@
 				:style="{width:localLabelWidth,justifyContent: localLabelAlign}">
 				<text v-if="required" class="is-required">*</text>
 				<text>{{label}}</text>
-				<text v-if="exception">&nbsp;<text class="red">异</text></text>
 			</view>
 		</slot>
 		<!-- #ifndef APP-NVUE -->
@@ -37,7 +36,6 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
 	 * @property {Boolean} required 是否必填，左边显示红色"*"号
 	 * @property {String } 	label 				输入框左边的文字提示
-	 * @property {Boolean } exception 		是否异常
 	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认70）
 	 * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
 	 * 	@value left		label 左侧显示
@@ -93,10 +91,6 @@
 				type: String,
 				default: ''
 			},
-      exception: {
-      	type: Boolean,
-      	default: false
-      },
 			// label的宽度
 			labelWidth: {
 				type: [String, Number],