From c8eb1d74a09537143e697c849ca6e8986344212e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 12 九月 2024 17:28:19 +0800
Subject: [PATCH] 3018 disabled也要显示具体控件
---
pages/modal/3018_2.vue | 18 +++++++-----------
pages/modal/3200_view.vue | 18 +++++++-----------
pages/modal/3200.vue | 14 ++++++--------
manifest.json | 4 ++--
4 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/manifest.json b/manifest.json
index aa2e77e..79bf226 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.25",
- "versionCode" : 1125,
+ "versionName" : "1.1.26",
+ "versionCode" : 1126,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index a941a38..2423495 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -8,16 +8,14 @@
<uni-forms-item v-if="item.name != 'Layout'&& item.show==true" :label="item.label +'锛� "
:label-width="item.labelWidth+'px'">
<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
- <span class="form-item-span" v-if="item.disabled"
- :style="'width: calc(100% - '+item.labelWidth+'px);'">{{item.value}}</span>
<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
- <uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+ <uni-data-select id="dv_select" v-if="item.name=='Select'"
:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
@change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
<!-- 鏂囨湰妗�鏁板瓧妗�-->
<view class="input-wrapper"
- v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+ v-if="(item.name=='Input' || item.name=='InputNumber')">
<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
@change="classAttr_extButton(item)"></text>
<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -30,7 +28,7 @@
@click="classAttr_extButton(item)"></text>
</view>
<!-- 澶氳鏂囨湰 -->
- <view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
+ <view class="input-wrapper" v-if="item.name=='Textarea' ">
<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
@blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
@@ -61,7 +59,7 @@
@change="onModelValue(item)" />
<!-- 鏃ユ湡鏃堕棿 -->
<view class="input-wrapper"
- v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
+ v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
<view class="picker">{{item.value}}</view>
@@ -74,10 +72,8 @@
:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
<uni-forms-item v-if="cols!=null && cols.show==true" :label="cols.label +'锛�"
:label-width="cols.labelWidth+'px'">
- <!-- <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text> -->
- <span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
<view class="input-wrapper"
- v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
+ v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
@change="onchange(cols)"></text>
<input class="uni-input" :class="cols.disabled?'input-disabled':''"
@@ -90,12 +86,12 @@
@click="onchange(cols)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
- <uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled"
+ <uni-data-select id="dv_select" v-if="cols.name=='Select' "
:class="cols.disabled?'input-disabled':''" v-model="cols.value"
:localdata="cols.dict" @change="onchange(cols)" :disabled="cols.disabled"
:clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
- <view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled">
+ <view class="input-wrapper" v-if="cols.name=='Textarea' ">
<textarea class="uni-input" :value="cols.value"
:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
:focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 32bd777..3ca938b 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -50,10 +50,9 @@
<view v-if="item.name!='Layout'">
<text class="txt_title"
:style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
- <!-- 鏂囨湰妗�鏁板瓧妗�-->
+ <!-- 鏂囨湰妗�鏁板瓧妗�-->
<view class="dv_input"
- v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+ v-if="(item.name=='Input' || item.name=='InputNumber')">
<text v-if="item.setting.prefix" class="uni-icon"
:class="[item.setting.prefix]" @change="onChange(item)"></text>
<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -66,12 +65,12 @@
:class="[item.setting.suffix]" @click="onChange(item)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
- <uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+ <uni-data-select id="dv_select" v-if="item.name=='Select'"
:class="item.disabled?'input-disabled':''" v-model="item.value"
:localdata="item.dict" @change="onChange(item)" :disabled="item.disabled"
:clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
- <view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
+ <view class="input-wrapper" v-if="item.name=='Textarea'">
<textarea class="uni-input" :value="item.value"
:class="item.disabled?'input-disabled':''"
:placeholder="item.placeholder" @blur="onModelValue(item)"
@@ -118,7 +117,6 @@
<view v-if="cols!=null">
<text class="txt_title"
:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
- <span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
<view class="dv_input"
v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
<text v-if="cols.setting.prefix" class="uni-icon"
@@ -137,13 +135,13 @@
</view>
<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
<uni-data-select id="dv_select"
- v-if="cols.name=='Select' && !cols.disabled"
+ v-if="cols.name=='Select'"
:class="cols.disabled?'input-disabled':''" v-model="cols.value"
:localdata="cols.dict" @change="onChange(cols)"
:disabled="cols.disabled" :clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
<view class="input-wrapper"
- v-if="cols.name=='Textarea' && !cols.disabled">
+ v-if="cols.name=='Textarea'">
<textarea class="uni-input" :value="cols.value"
:class="cols.disabled?'input-disabled':''"
:placeholder="cols.placeholder" @blur="onModelValue(cols)"
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index da83c89..b4d98b7 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -16,11 +16,9 @@
<!-- 鏅�甯冨眬 -->
<view v-if="item.name!='Layout'">
<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <span class="form-item-span"
- v-if="item.disabled">{{item.value2?'#'+item.value+'#'+item.value2:item.value}}</span>
<!-- 鏂囨湰妗�鏁板瓧妗�-->
<view class="dv_input"
- v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+ v-if="(item.name=='Input' || item.name=='InputNumber') ">
<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
@change="onChange(item)"></text>
<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -32,12 +30,12 @@
@click="onChange(item)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
- <uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+ <uni-data-select id="dv_select" v-if="item.name=='Select'"
:class="item.disabled?'input-disabled':''" v-model="item.value"
:localdata="item.dict" @change="onChange(item)" :disabled="item.disabled"
:clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
- <view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
+ <view class="input-wrapper" v-if="item.name=='Textarea'">
<textarea class="uni-input" :value="item.value"
:class="item.disabled?'input-disabled':''" :placeholder="item.placeholder"
@blur="onModelValue(item)" style="height:60px;" :style="{'width':'96%'}"
@@ -68,7 +66,7 @@
:style="{'margin-left':'10rpx'}" />
<!-- 鏃ユ湡鏃堕棿 -->
<view class="input-wrapper"
- v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
+ v-if="(item.name=='TimePicker' || item.name=='DatePicker') ">
<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
<view class="picker">{{item.value}}</view>
@@ -82,10 +80,8 @@
<view v-if="cols!=null">
<text class="txt_title"
:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
- <span class="form-item-span"
- v-if="cols.disabled">{{cols.value2?'#'+cols.value+'#'+cols.value2:cols.value}}</span>
<view class="dv_input"
- v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
+ v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
<text v-if="cols.setting.prefix" class="uni-icon"
:class="[cols.setting.prefix]" @change="onChange(cols)"></text>
<input class="uni-input" :class="cols.disabled?'input-disabled':''"
@@ -98,12 +94,12 @@
:class="[cols.setting.suffix]" @click="onChange(cols)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
- <uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled"
+ <uni-data-select id="dv_select" v-if="cols.name=='Select' "
:class="cols.disabled?'input-disabled':''" v-model="cols.value"
:localdata="cols.dict" @change="onChange(cols)" :disabled="cols.disabled"
:clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
- <view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled">
+ <view class="input-wrapper" v-if="cols.name=='Textarea' ">
<textarea class="uni-input" :value="cols.value"
:class="cols.disabled?'input-disabled':''"
:placeholder="cols.placeholder" @blur="onModelValue(cols)"
--
Gitblit v1.9.1