kz-ui-base 1.0.111 → 1.0.112
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.
|
@@ -627,7 +627,7 @@ export default class dropDownList extends Vue {
|
|
|
627
627
|
"dictLabel",
|
|
628
628
|
"dictValue"
|
|
629
629
|
);
|
|
630
|
-
let newitems = [{ text: "---请选择---", value: undefined }];
|
|
630
|
+
let newitems = [{ text: this.setting.allName?this.setting.allName:"---请选择---", value: undefined }];
|
|
631
631
|
items.forEach((item) => {
|
|
632
632
|
if (item.text.indexOf(this.setting.findValue) != -1) {
|
|
633
633
|
newitems.push(item);
|
|
@@ -732,7 +732,7 @@ export default class dropDownList extends Vue {
|
|
|
732
732
|
this.setting.displayField || "componentName",
|
|
733
733
|
this.setting.valueField || "id"
|
|
734
734
|
);
|
|
735
|
-
let newitems = [{ text:
|
|
735
|
+
let newitems = [{ text:this.setting.allName?this.setting.allName:"---请选择---", value: undefined }];
|
|
736
736
|
items.forEach((item: any) => {
|
|
737
737
|
if (item.value) {
|
|
738
738
|
if (
|
|
@@ -835,7 +835,7 @@ export default class dropDownList extends Vue {
|
|
|
835
835
|
if (!valueField) valueField = this.setting.valueField;
|
|
836
836
|
var items = [];
|
|
837
837
|
if (this.setting.isShowPleaseChoose != false)
|
|
838
|
-
items.push({ text:
|
|
838
|
+
items.push({ text:this.setting.allName?this.setting.allName:"---请选择---", value: undefined });
|
|
839
839
|
if (source) {
|
|
840
840
|
this.itemList = source;
|
|
841
841
|
for (var item of source) {
|
|
@@ -844,7 +844,7 @@ export default class dropDownList extends Vue {
|
|
|
844
844
|
}
|
|
845
845
|
/*console.log("下拉",items);*/
|
|
846
846
|
if (this.column.setting && this.column.setting.chooseFirst) {
|
|
847
|
-
if (items[0].text ==
|
|
847
|
+
if (items[0].text ==this.setting.allName?this.setting.allName:"---请选择---" || items[0].text == "请选择") {
|
|
848
848
|
this.$set(this.entity, String(this.column.property), items[1].text);
|
|
849
849
|
this.onChangeEvent(this.entity[this.column.property], true);
|
|
850
850
|
} else {
|