@@ -32,7 +32,7 @@ import { computed, onMounted, reactive, toRefs, watch,ref } from "vue"
const state = reactive({
showFlag: false,
- modelValue: ""
+ value: ""
})
const props = defineProps({
@@ -47,20 +47,20 @@ const props = defineProps({
})
watch(props,(n,o) => {
- state.modelValue = n.modelValue
+ state.value = n.modelValue
})
-watch(() => state.modelValue,(n,o) => {
+watch(() => state.value,(n,o) => {
emit('update:modelValue',n)
})
const emit = defineEmits(['search','update:modelValue'])
const search = () => {
- emit('search',state.modelValue)
+ emit('search',state.value)
}
const moreFilter = () => {
state.showFlag = !state.showFlag
}
onMounted(() => {
- state.modelValue = props.modelValue
+ state.value = props.modelValue
})
-const { modelValue,showFlag } = toRefs(state)
+const { value,showFlag } = toRefs(state)
\ No newline at end of file
diff --git a/src/bg-ui/bg-switch-ele.vue b/src/bg-ui/bg-switch-ele.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1646344ef262edfe42d8369b896394a732a5c81f
--- /dev/null
+++ b/src/bg-ui/bg-switch-ele.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
diff --git a/src/bg-ui/bg-switch.vue b/src/bg-ui/bg-switch.vue
index 62c03cd44c95e545cf2ce235d981c101ab37532f..5578a31b72810b86dc2b8bb63075cce6b2d10273 100644
--- a/src/bg-ui/bg-switch.vue
+++ b/src/bg-ui/bg-switch.vue
@@ -58,24 +58,22 @@ export default {
},
now_style() {
return {
- color: this.colors[this.now_index],
borderColor: this.colors[this.now_index],
+ backgroundColor: this.colors[this.now_index],
};
},
now_label_style() {
return this.now_index == 0
? { left: this.circle_height + this.gap + 5 + "px" }
- : { left: "10px" };
+ : { left: "6px" };
},
now_circle_style() {
return this.now_index == 0
? {
left: this.gap + "px",
- backgroundColor: this.colors[this.now_index],
}
: {
right: this.gap + "px",
- backgroundColor: this.colors[this.now_index],
};
},
},
diff --git a/src/bg-ui/bg-table-btns-more.vue b/src/bg-ui/bg-table-btns-more.vue
new file mode 100644
index 0000000000000000000000000000000000000000..c24d3e1704e7c6587ef93c4f988fb97e39b9b602
--- /dev/null
+++ b/src/bg-ui/bg-table-btns-more.vue
@@ -0,0 +1,69 @@
+
+
+
+ {{ getName(item) }}
+
+
+
+
+
diff --git a/src/bg-ui/bg-table-btns.vue b/src/bg-ui/bg-table-btns.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2849bdab0cc851aec72e0a5ecd23432615b0fae1
--- /dev/null
+++ b/src/bg-ui/bg-table-btns.vue
@@ -0,0 +1,91 @@
+
+
+
+ {{ getName(item) }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bg-ui/index.js b/src/bg-ui/index.js
index 3c997eab95d366818ed647a9eed24aa75342d814..7b487be6e3786ac62c369c86c1f25c72b7a861f3 100644
--- a/src/bg-ui/index.js
+++ b/src/bg-ui/index.js
@@ -33,6 +33,8 @@
import BgPagination from './bg-pagination.vue'
import BgInnerTabs from './bg-inner-tabs.vue'
import BgFilterGroup from './bg-filter-group.vue'
+ import BgSwitchEle from './bg-switch-ele.vue'
+ import BgTableBtns from './bg-table-btns.vue'
const components = {
BgIcon,//字体图标
@@ -67,6 +69,8 @@ const components = {
BgPagination,// 分页组件
BgInnerTabs,//内部tab
BgFilterGroup,//高级搜索
+ BgSwitchEle,
+ BgTableBtns,
};
const install = (Vue) => {
diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss
index d6a458c429e0d0c363c0b7e0025958d44b483a14..c51a51f8375a51636c943ea57f9329183e228b84 100644
--- a/src/bg-ui/index.scss
+++ b/src/bg-ui/index.scss
@@ -659,11 +659,11 @@ a {
}
th,
td {
- padding: 12px 0!important;
+ padding: 11px 0!important;
> .cell {
padding: 0 10px !important;
color: #404a62;
- line-height: 18px;
+ line-height: 14px;
}
}
@@ -2036,29 +2036,31 @@ a {
.bg-switch {
display: inline-block;
vertical-align: middle;
- width: 64px;
- height: 28px;
- border-radius: 14px;
- border: solid 2px #275a9d;
+ width: 44px;
+ height: 20px;
+ border-radius: 10px;
+ border: solid 2px #2b4695;
position: relative;
- color: #275a9d;
+ color: #fff;
+ background-color: #2b4695;
cursor: pointer;
user-select: none;
> .label {
font-size: 12px;
- font-weight: 600;
- line-height: 24px;
+ font-weight: 400;
+ line-height: 15px;
position: absolute;
+ color: #fff;
}
> .circle {
- width: 18px;
- height: 18px;
+ width: 16px;
+ height: 16px;
border-radius: 50%;
position: absolute;
- top: 3px;
- background-color: #275a9d;
+ // top: 2px;
+ background-color: #fff;
}
&.disabled {
@@ -2471,4 +2473,64 @@ a {
border: 1px solid #e6e9ef;
padding: 24px 16px 8px;
}
+}
+// 表格操作按钮组
+.bg-table-btns {
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.bg-table-btns-more {
+ position: absolute;
+ top: 28px;
+ right: -16px;
+ z-index: 19;
+ padding: 4px 0;
+ background-color: #ffffff;
+ box-shadow: 0px 4px 12px 0px rgba(18, 30, 63, 0.1);
+ border-radius: 4px;
+ border: solid 1px #e6e9ef;
+ width: 88px;
+
+ .bg-table-btn {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-break: break-all;
+ white-space: nowrap;
+ display: block;
+ padding: 0 16px;
+ margin: 0;
+ color: #202531;
+ line-height: 34px;
+ padding-left: 16px;
+ &:hover {
+ background-color: #f2f3f7;
+ color: #202531;
+ }
+
+ &.disabled {
+ color: #a9b1c7;
+ }
+ &::before {
+ display: none;
+ }
+ }
+
+ &::before {
+ content: "";
+ position: absolute;
+ top: -10px;
+ left: 0;
+ height: 10px;
+ width: 100%;
+ }
+}
+
+.bg-switch-ele {
+ width: 44px;
+ height: 20px;
+ .el-switch__core {
+ width: 100%;
+ }
}
\ No newline at end of file
diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue
index 43118a31d7c8246e16e220287bf5944bace57d0f..37c73554894f1db77a8996494430ffbd40a4d958 100644
--- a/src/page/main/config/dict/index.vue
+++ b/src/page/main/config/dict/index.vue
@@ -9,11 +9,11 @@
-
+
@@ -57,19 +57,21 @@
-
- {{ ["-","启用","禁用"][row.state] }}
-
{{ row.updated_time.split("+")[0].replace("T", " ").replace("Z", " ") }}
+
+
+
-
- 编辑
-
-
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+ 确定要删除此字典值吗?
+
+
+ 取 消
+ 确 定
+
+
+