@zscreate/zhxy-app-component 1.0.347 → 1.0.349
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -224,7 +224,7 @@
|
|
|
224
224
|
</view>
|
|
225
225
|
|
|
226
226
|
<view class="evan-form-item-container__main--body" v-else>
|
|
227
|
-
<uni-datetime-picker ref="datetime_picker" @change="dateChange" :hide-second="!widget.options.format.includes(':ss')" @click.native="isClickByUser = true" :type="widget.options.type"
|
|
227
|
+
<uni-datetime-picker ref="datetime_picker" @change="dateChange" :hide-second="!(widget.options.format&&widget.options.format.includes(':ss'))" @click.native="isClickByUser = true" :type="widget.options.type"
|
|
228
228
|
:format="formatTime()" :clearIcon="!widget.options.disabled && widget.options.clearable"
|
|
229
229
|
:value="dataModel" @maskClick="maskClick" :border="false" :disabled="widget.options.disabled">
|
|
230
230
|
<view class="option-font-size">
|
|
@@ -823,10 +823,12 @@ export default {
|
|
|
823
823
|
},
|
|
824
824
|
inject: {
|
|
825
825
|
formContext: {
|
|
826
|
-
form: 'formContext'
|
|
826
|
+
form: 'formContext',
|
|
827
|
+
default:()=>{}
|
|
827
828
|
},
|
|
828
829
|
dataObj: {
|
|
829
|
-
form: 'dataObj'
|
|
830
|
+
form: 'dataObj',
|
|
831
|
+
default:()=>{}
|
|
830
832
|
},
|
|
831
833
|
formShowError: {
|
|
832
834
|
form: 'formShowError',
|
|
@@ -2355,7 +2357,7 @@ export default {
|
|
|
2355
2357
|
})
|
|
2356
2358
|
console.log(this.linkage)
|
|
2357
2359
|
let model = this.widget.model
|
|
2358
|
-
let arr = Object.keys(this.linkage)
|
|
2360
|
+
let arr = this.linkage?Object.keys(this.linkage):[]
|
|
2359
2361
|
let id = ''
|
|
2360
2362
|
if (arr.length > 0 && this.linkage.hasOwnProperty(model)) {
|
|
2361
2363
|
id = this.linkage[model]
|
|
@@ -2410,7 +2412,7 @@ export default {
|
|
|
2410
2412
|
getParent() {
|
|
2411
2413
|
let parent = this.$parent
|
|
2412
2414
|
let parentName = parent.$options.name
|
|
2413
|
-
while (parentName !== 'EvanForm') {
|
|
2415
|
+
while (parentName&&parentName !== 'EvanForm') {
|
|
2414
2416
|
parent = parent.$parent
|
|
2415
2417
|
parentName = parent.$options.name
|
|
2416
2418
|
}
|
|
@@ -2915,14 +2917,23 @@ checkbox-group label {
|
|
|
2915
2917
|
::v-deep .form-input-placeholder {
|
|
2916
2918
|
// line-height: 90upx;
|
|
2917
2919
|
color: #555 !important;
|
|
2920
|
+
overflow: hidden;
|
|
2921
|
+
text-overflow: ellipsis;
|
|
2922
|
+
white-space: nowrap;
|
|
2918
2923
|
}
|
|
2919
2924
|
::v-deep .form-input-placeholder-textarea {
|
|
2920
2925
|
text-align: left !important;
|
|
2926
|
+
overflow: hidden;
|
|
2927
|
+
text-overflow: ellipsis;
|
|
2928
|
+
white-space: nowrap;
|
|
2921
2929
|
}
|
|
2922
2930
|
.form-textarea-placeholder {
|
|
2923
2931
|
padding-top: 28upx;
|
|
2924
2932
|
font-size: 34upx;
|
|
2925
2933
|
width: 100%;
|
|
2934
|
+
overflow: hidden;
|
|
2935
|
+
text-overflow: ellipsis;
|
|
2936
|
+
white-space: nowrap;
|
|
2926
2937
|
}
|
|
2927
2938
|
|
|
2928
2939
|
.evan-form-item-container--top .radio-height {
|