Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ defineExpose({ open })
</el-form>

<template #footer>
<el-button :disabled="loading" @click="visible = false">取消</el-button>
<el-button plain :disabled="loading" @click="visible = false">取消</el-button>
<el-button type="primary" :loading="loading" @click="handleSubmit">
{{ editId ? '保存' : '创建' }}
</el-button>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/business/folder-tree/MoveToDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ defineExpose({ close, open })
/>

<template #footer>
<el-button :disabled="loading" @click="visible = false">取消</el-button>
<el-button plain :disabled="loading" @click="visible = false">取消</el-button>
<el-button type="primary" :disabled="!canSubmit" :loading="loading" @click="handleSubmit">确定</el-button>
</template>
</MkDialog>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/codemirror-editor/Json.vue
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ defineExpose({ format, validateRules })
</div>

<template #footer>
<el-button @click="closeEditorDialog">取消</el-button>
<el-button plain @click="closeEditorDialog">取消</el-button>
<el-button type="primary" @click="submitEditorDialog">确定</el-button>
</template>
</MkDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function handleConfirm() {

<div class="p-3 text-right">
<!-- 清除多选筛选 -->
<el-button class="min-w-12! w-12!" size="small" @click="handleReset">重置</el-button>
<el-button plain class="min-w-12! w-12!" size="small" @click="handleReset">重置</el-button>
<!-- 确认多选筛选 -->
<el-button class="min-w-12! w-12!" size="small" type="primary" @click="handleConfirm">确定</el-button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/mk-dynamics-form/Demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ const validateForm = async () => {
<MkDialog :align-center="false" v-model="dialogVisible" :title="isEdit ? '编辑字段' : '添加字段'" width="600px" append-to-body destroy-on-close>
<MkDynamicsFormConstructor ref="constructorRef" v-model="currentField" :enable-visibility="true" :left-options="visibilityFieldOptions" />
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitField">确定</el-button>
</template>
</MkDialog>
Expand Down
28 changes: 18 additions & 10 deletions ui/src/components/mk-dynamics-form/items/table/TableCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import type { DynamicFormValue } from '../../type'
import type { FormField } from '@/components/mk-dynamics-form/type'
import { computed, ref, watch } from 'vue'
import { Search } from '@element-plus/icons-vue'
import type { TableInstance } from 'element-plus'

import _ from 'lodash'
Expand Down Expand Up @@ -135,24 +134,33 @@ const activeText = computed(() => {
<div class="header">
<div class="title">{{ title }}</div>

<el-input v-model="filterText" :validate-event="false" placeholder="请输入关键词搜索" class="input-with-select" style="--el-color-danger: #c0c4cc" clearable>
<template #prepend>
<el-button :icon="Search" />
</template>
</el-input>
<!-- 搜索表格选项 -->
<MkSearchInput
v-model="filterText"
:validate-event="false"
placeholder="请输入关键词搜索"
class="input-with-select"
style="--el-color-danger: #c0c4cc"
/>
</div>

<el-table ref="multipleTableRef" :data="tableData" highlight-current-row style="width: 100%; height: 100%; --el-bg-color: #f5f6f7" @selection-change="handleSelectionChange">
<el-table
ref="multipleTableRef"
:data="tableData"
highlight-current-row
style="width: 100%; height: 100%; --el-bg-color: #f5f6f7"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column v-for="(column, index) in tableColumns" :key="index" v-bind="column" :label="column.label">
<template #default="scope">
<template v-if="column.type === 'component'">
<TableColumn :column="column" :row="scope.row"></TableColumn>
</template>
<template v-else-if="column.type === 'eval'"> <span v-html="evalF(column.property, scope.row)"></span></template>
<template v-else-if="column.type === 'eval'"><span v-html="evalF(column.property, scope.row)"></span></template>
<template v-else>
<span>{{ scope.row[column.property] }}</span></template
>
<span>{{ scope.row[column.property] }}</span>
</template>
</template>
</el-table-column>
</el-table>
Expand Down
20 changes: 11 additions & 9 deletions ui/src/components/mk-dynamics-form/items/table/TableRadio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import type { DynamicFormValue } from '../../type'
import type { FormField } from '@/components/mk-dynamics-form/type'
import { computed, ref, watch } from 'vue'
import { Search } from '@element-plus/icons-vue'
import type { TableInstance } from 'element-plus'

import _ from 'lodash'
Expand Down Expand Up @@ -121,11 +120,14 @@ const activeText = computed(() => {
<div class="header">
<div class="title">{{ title }}</div>

<el-input v-model="filterText" :validate-event="false" placeholder="请输入关键词搜索" class="input-with-select" style="--el-color-danger: #c0c4cc" clearable>
<template #prepend>
<el-button :icon="Search" />
</template>
</el-input>
<!-- 搜索表格选项 -->
<MkSearchInput
v-model="filterText"
:validate-event="false"
placeholder="请输入关键词搜索"
class="input-with-select"
style="--el-color-danger: #c0c4cc"
/>
</div>

<el-table
Expand All @@ -145,10 +147,10 @@ const activeText = computed(() => {
<template v-if="column.type === 'component'">
<TableColumn :column="column" :row="scope.row"></TableColumn>
</template>
<template v-else-if="column.type === 'eval'"> <span v-html="evalF(column.property, scope.row)"></span></template>
<template v-else-if="column.type === 'eval'"><span v-html="evalF(column.property, scope.row)"></span></template>
<template v-else>
<span>{{ scope.row[column.property] }}</span></template
>
<span>{{ scope.row[column.property] }}</span>
</template>
</template>
</el-table-column>
</el-table>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/conversation-panel/main/share-panel/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const handleShare = () => {
</el-checkbox>
<span class="min-w-0 flex-1 truncate text-N600">已选择 {{ selectedCount }} 条对话</span>
<!-- 退出分享模式 -->
<el-button @click="share.close()">取消</el-button>
<el-button plain @click="share.close()">取消</el-button>
<!-- 分享已选对话 -->
<el-button type="primary" class="ml-0!" :disabled="!selectedCount" :loading="share.sharing.value" @click="handleShare">分享</el-button>
</header>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/trigger/trigger-form/TriggerFormDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ defineExpose({ open })
</div>
<template #footer>
<!-- 取消触发器编辑 -->
<el-button :disabled="saving" @click="visible = false">取消</el-button>
<el-button plain :disabled="saving" @click="visible = false">取消</el-button>
<!-- 保存触发器配置 -->
<el-button type="primary" :loading="saving" :disabled="loading || detailFailed" @click="handleSave">
{{ editingId ? '保存' : '创建' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ defineExpose({ open, close })
</el-form>
<template #footer>
<!-- 取消 -->
<el-button :disabled="saving" @click="visible = false">取消</el-button>
<el-button plain :disabled="saving" @click="visible = false">取消</el-button>
<!-- 提交版本内容 -->
<el-button type="primary" :loading="saving" @click="handleSubmit">发布</el-button>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ function deleteNode() {
</el-form-item>
</el-form>
<template #footer>
<el-button @click.prevent="nodeNameDialogVisible = false">取消</el-button>
<el-button plain @click.prevent="nodeNameDialogVisible = false">取消</el-button>
<el-button type="primary" @click="saveNodeName(titleFormRef)">保存</el-button>
</template>
</MkDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ defineExpose({ open, close })
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitField">{{ editingIndex === undefined ? '添加' : '保存' }}</el-button>
</template>
</MkDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ defineExpose({ open, close })
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitField">{{ editingIndex === undefined ? '添加' : '保存' }}</el-button>
</template>
</MkDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ defineExpose({ open, close })
<MkDialog v-model="fieldDialogVisible" :title="editingIndex === undefined ? '添加参数' : '编辑参数'" @closed="resetData">
<MkDynamicsFormConstructor ref="constructorRef" v-model="currentField" enable-visibility :left-options="visibilityOptions" />
<template #footer>
<el-button @click="fieldDialogVisible = false">取消</el-button>
<el-button plain @click="fieldDialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitField">{{ editingIndex === undefined ? '添加' : '保存' }}</el-button>
</template>
</MkDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ defineExpose({ open })
</el-form-item>
</el-form>
<template #footer>
<el-button @click="settingDialogVisible = false">取消</el-button>
<el-button plain @click="settingDialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitSetting">保存</el-button>
</template>
</MkDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ defineExpose({ open, close })
</el-form>
<template #footer>
<!-- 取消设置 -->
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<!-- 保存标题 -->
<el-button type="primary" @click="submitTitle">保存</el-button>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ defineExpose({ open, close })
<MkDynamicsFormConstructor ref="constructorRef" v-model="currentField" :field-type-options="fieldTypeOptions" />
<template #footer>
<!-- 取消编辑 -->
<el-button @click="close">取消</el-button>
<el-button plain @click="close">取消</el-button>
<!-- 提交参数 -->
<el-button type="primary" @click="submitField">{{ editingIndex === undefined ? '添加' : '保存' }}</el-button>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ defineExpose({ open, close })
</el-form-item>
</el-form>
<template #footer>
<el-button @click="close">取消</el-button>
<el-button plain @click="close">取消</el-button>
<el-button type="primary" @click="submit">{{ isEdit ? '保存' : '添加' }}</el-button>
</template>
</MkDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ defineExpose({ open })
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click.prevent="dialogVisible = false">取消</el-button>
<el-button plain @click.prevent="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="loading" @click="submit(formRef)">保存</el-button>
</span>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ defineExpose({ open, close })
<template #footer>
<span>
<!-- 取消编辑 -->
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<!-- 提交参数 -->
<el-button type="primary" @click="submitField">
{{ editingIndex === undefined ? '添加' : '保存' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ defineExpose({ open, close })
</el-form>
<template #footer>
<!-- 取消设置 -->
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<!-- 保存标题 -->
<el-button type="primary" @click="submitTitle">保存</el-button>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ defineExpose({ open, close })
<template #footer>
<span>
<!-- 取消编辑 -->
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<!-- 提交参数 -->
<el-button type="primary" @click="submitField">
{{ editingIndex === undefined ? '添加' : '保存' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ defineExpose({ open, close })
</el-form>
<template #footer>
<!-- 取消设置 -->
<el-button @click="dialogVisible = false">取消</el-button>
<el-button plain @click="dialogVisible = false">取消</el-button>
<!-- 保存标题 -->
<el-button type="primary" @click="submitTitle">保存</el-button>
</template>
Expand Down
Loading