Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict
This commit is contained in:
commit
163da9f589
|
|
@ -189,6 +189,7 @@ const headerTools = computed(() => [
|
||||||
searchable: false,
|
searchable: false,
|
||||||
placeholder: "انتخاب کنید",
|
placeholder: "انتخاب کنید",
|
||||||
items: [
|
items: [
|
||||||
|
{ label: " همه", value: "all" },
|
||||||
{ label: " تعارض مستقر", value: "stable" },
|
{ label: " تعارض مستقر", value: "stable" },
|
||||||
{ label: "تعارض مشروط", value: "conditional" },
|
{ label: "تعارض مشروط", value: "conditional" },
|
||||||
{ label: "تکرار حکم", value: "duplicate" },
|
{ label: "تکرار حکم", value: "duplicate" },
|
||||||
|
|
@ -211,6 +212,7 @@ const headerTools = computed(() => [
|
||||||
searchable: false,
|
searchable: false,
|
||||||
placeholder: "انتخاب کنید",
|
placeholder: "انتخاب کنید",
|
||||||
items: [
|
items: [
|
||||||
|
{ label: " همه", value: "all" },
|
||||||
{ label: "نامعتبر", value: "invalid" },
|
{ label: "نامعتبر", value: "invalid" },
|
||||||
{ label: "معتبر", value: "valid" },
|
{ label: "معتبر", value: "valid" },
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user