WxxyDeveloper/JSL_OrganizeInternalOAWeb
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tailwind style conflicts with antd

Browse Source
This commit is contained in:
tuxiu21 2024-03-14 18:10:16 +08:00
parent d712294c72
commit 80b9ffd752
5 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.vue
View File

@ -1,5 +1,9 @@
<template> <template>
<router-view></router-view> <!-- 解决tailwind冲突问题 -->
<a-style-provider hash-priority="high">
<router-view></router-view>
</a-style-provider>
</template> </template>
<script> <script>
</script> </script>

4
src/assert/main.css
View File

@ -1,3 +1,7 @@
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
svg {
vertical-align: baseline;
}

2
src/components/HomeComponents/NavBar.vue
View File

@ -193,7 +193,7 @@ const items = ref([
label: '新闻',} label: '新闻',}
]); ]);
const appValue = current[0].key; // 使用点号访问属性 // const appValue = current[0].key; // 使用点号访问属性
const current = ref(); const current = ref();
// 传对应key给current但是没用怎么回事 // 传对应key给current但是没用怎么回事
function updateCurrent(key) { function updateCurrent(key) {

65
src/views/WorkLoadPage/I_Responsible.vue
View File

@ -67,53 +67,34 @@
<a-form-item label="工作量"> <a-form-item label="工作量">
<a-input /> <a-input />
</a-form-item> </a-form-item>
<a-form-item label="Checkbox"> <a-form-item label="状态">
<a-checkbox>checkbox</a-checkbox> <a-select
</a-form-item> ref="select"
<a-form-item label="Radio"> v-model:value="value1"
<a-radio-group v-model:value="radioValue"> style="width: 120px"
<a-radio value="apple">Apple</a-radio> @focus="focus"
<a-radio value="pear">Pear</a-radio> @change="handleChange"
</a-radio-group> >
</a-form-item> <a-select-option value="jack">Jack</a-select-option>
<a-select-option value="lucy">Lucy</a-select-option>
<a-form-item label="Select"> <a-select-option value="disabled" disabled>Disabled</a-select-option>
<a-select> <a-select-option value="Yiminghe">yiminghe</a-select-option>
<a-select-option value="demo">Demo</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="TreeSelect"> <a-form-item label="项目描述">
<a-tree-select :tree-data="treeData" /> <a-textarea v-model:value="value" placeholder="Basic usage" :rows="4" />
</a-form-item> </a-form-item>
<a-form-item label="Cascader"> <a-form-item label="上传文档">
<a-cascader :options="options" /> <a-upload
</a-form-item> :default-file-list="defaultFileList"
<a-form-item label="DatePicker"> :customRequest="customRequest"
<a-date-picker /> :showUploadList="false"
</a-form-item> >
<a-form-item label="RangePicker"> <a-button icon="upload">Upload</a-button>
<a-range-picker />
</a-form-item>
<a-form-item label="InputNumber">
<a-input-number />
</a-form-item>
<a-form-item label="TextArea">
<a-textarea :rows="4" />
</a-form-item>
<a-form-item label="Switch">
<a-switch v-model:checked="checked" />
</a-form-item>
<a-form-item label="Upload">
<a-upload action="/upload.do" list-type="picture-card">
<div>
<PlusOutlined />
<div style="margin-top: 8px">Upload</div>
</div>
</a-upload> </a-upload>
</a-form-item> </a-form-item>
<a-form-item label="Button">
<a-button>Button</a-button>
</a-form-item>
</a-form> </a-form>
</a-modal> </a-modal>
</a-tooltip> </a-tooltip>

2
tailwind.config.js
View File

@ -10,4 +10,6 @@ module.exports = {
plugins: [ plugins: [
require('flowbite/plugin') require('flowbite/plugin')
], ],
} }