Merge branch 'main' of github.com:apache/skywalking-booster-ui into feat/metrics

This commit is contained in:
Fine 2022-10-27 20:32:53 +08:00
commit 7ebe6adc9a
5 changed files with 10 additions and 7 deletions

View File

@ -18,7 +18,6 @@ limitations under the License. -->
v-model="selected"
:placeholder="placeholder"
@change="changeSelected"
filterable
:multiple="multiple"
:disabled="disabled"
:style="{ borderRadius }"
@ -26,6 +25,7 @@ limitations under the License. -->
:remote="isRemote"
:reserve-keyword="isRemote"
:remote-method="remoteMethod"
:filterable="filterable"
>
<el-option
v-for="item in options"
@ -66,6 +66,7 @@ const props = defineProps({
disabled: { type: Boolean, default: false },
clearable: { type: Boolean, default: false },
isRemote: { type: Boolean, default: false },
filterable: { type: Boolean, default: true },
});
const selected = ref<string[] | string>(props.value);

View File

@ -101,7 +101,7 @@ export default defineComponent({
...CustomOptions,
},
setup() {
const configHeight = document.documentElement.clientHeight - 520;
const configHeight = document.documentElement.clientHeight - 540;
const { t } = useI18n();
const dashboardStore = useDashboardStore();
const appStoreWithOut = useAppStoreWithOut();

View File

@ -23,6 +23,7 @@ limitations under the License. -->
placeholder="Select a widget"
class="selectors"
@change="updateWidgetConfig"
:filterable="false"
/>
</div>
</template>

View File

@ -31,6 +31,7 @@ limitations under the License. -->
:options="Status"
placeholder="Select a status"
@change="updateConfig({ status: $event[0].value })"
class="selector"
/>
</div>
<div class="item">
@ -40,6 +41,7 @@ limitations under the License. -->
:value="queryOrder"
:options="QueryOrders"
placeholder="Select a option"
class="selector"
@change="updateConfig({ queryOrder: $event[0].value })"
/>
</div>
@ -87,4 +89,8 @@ function updateConfig(param: { [key: string]: unknown }) {
.item {
margin-bottom: 10px;
}
.selector {
width: 500px;
}
</style>

View File

@ -17,11 +17,6 @@ limitations under the License. -->
v-if="traceStore.currentTrace.endpointNames"
>
<h5 class="mb-5 mt-0">
<Icon
icon="clear"
v-if="traceStore.currentTrace.isError"
class="red mr-5 sm"
/>
<span class="vm">{{ traceStore.currentTrace.endpointNames[0] }}</span>
<div class="trace-log-btn">
<el-button