🔱: [client] sync upgrade with 11 commits [trident-sync]

refactor: 1.11.7
refactor: 1.11.6
refactor: 1.11.5
refactor: ui interface
refactor: ui interface
refactor: ui interface
refactor: 1.11.4
fix: 多级表头列设置不显示bug
fix: tabs,修复连续触发两次查询的bug

https://github.com/fast-crud/fast-crud/issues/161
perf: 文本复制组件优化
This commit is contained in:
GitHub Actions Bot
2023-03-22 19:23:53 +00:00
parent af25254628
commit 040b2e8a53
10 changed files with 97 additions and 7 deletions
-1
View File
@@ -10,7 +10,6 @@ import i18n from "./i18n";
import store from "./store";
import components from "./components";
import plugin from "./plugin/";
// @ts-ignore
const app = createApp(App);
// 尽量
@@ -1,5 +1,6 @@
import LayoutFramework from "/src/layout/layout-framework.vue";
import { crudResources } from "/@/router/source/modules/crud";
import { uiResources } from "/@/router/source/modules/ui";
import { sysResources } from "/@/router/source/modules/sys";
export const frameworkResource = [
{
@@ -0,0 +1,30 @@
export const uiResources = [
{
title: "UI示例",
name: "ui",
path: "/ui",
redirect: "/ui/form",
meta: {
icon: "ion:apps-sharp"
},
children: [
{
title: "表单组件",
name: "UIForm",
path: "/ui/form",
redirect: "/ui/form/input",
meta: {
icon: "ion:disc-outline"
},
children: [
{
title: "input",
name: "UIFormInput",
path: "/ui/form/input",
component: "/ui/form/input/index.vue"
}
]
}
]
}
];
@@ -10,6 +10,8 @@
<template #actionbar-right>
<a-alert class="ml-1" type="warning" message="列设置可以禁用或者隐藏某字段勾选 ,-------> 点击右侧最后一个按钮查看效果" />
<a-button @click="columnsSetToggleMode()"> 切换简单模式 </a-button>
<a-button @click="columnsSetShowToggle()"> 动态修改列设置显隐 </a-button>
</template>
</fs-crud>
</fs-page>
@@ -36,10 +38,14 @@ export default defineComponent({
message.info("点击列设置按钮查看效果,当前列设置组件的模式为:" + crudBinding.value.toolbar.columnsFilter.mode);
}
function columnsSetShowToggle() {
crudBinding.value.table.columns[3].columnSetShow = !crudBinding.value.table.columns[3].columnSetShow;
}
return {
crudBinding,
crudRef,
columnsSetToggleMode
columnsSetToggleMode,
columnsSetShowToggle
};
}
});
@@ -1,5 +1,14 @@
<template>
<fs-page>
<template #header>
<div class="title">
文本类型
<span class="sub">
<span>type='text'</span>
<fs-copyable :inline="true" model-value="文本复制组件测试" style="width: 200px; margin-left: 100px" :button="{ showOnHover: false, show: true, text: '点我复制' }" />
</span>
</div>
</template>
<fs-crud ref="crudRef" v-bind="crudBinding" />
</fs-page>
</template>
@@ -38,6 +38,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
text: "自定义",
show: true,
order: 3,
class: "fs-test",
icon: {
icon: "ant-design:search",
style: {
@@ -52,7 +52,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
name: "radio",
show: true
//type: 'card', //tabs类型
// defaultOptions: { //第一个tab页签显示
// defaultOption: { //第一个tab页签显示
// show: true,
// value: null, //点击第一个页签,查询值
// label: '全部', // 第一个页签的名称
@@ -0,0 +1,21 @@
<template>
<fs-page>
<template #header>
<div class="title">input输入框</div>
</template>
<component :is="ui.card.name">
<fs-ui-render :render-fn="inputDemo1Render"></fs-ui-render>
</component>
</fs-page>
</template>
<script lang="ts" setup>
import { useUi } from "@fast-crud/fast-crud";
import { ref } from "vue";
const { ui } = useUi();
const textRef = ref();
function inputDemo1Render() {
return ui.input.render({ vModel: { ref: textRef, key: "value" } });
}
</script>