wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：修复工作流bug，修复builder报错

Browse Source
This commit is contained in:
Jerry
2024-07-24 17:43:48 +08:00
parent 51ff5033e1
commit bb01172492
77 changed files with 391 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OrangeFormsOpen-VUE3/src/components/Dialog/index.ts
View File

@@ -73,7 +73,9 @@ export class Dialog {
let layerOptions: ANY_OBJECT = {
title: title,
type: 1,
skin: 'layui-layer-page',
skin:
'layui-layer-page ' +
(window.innerWidth <= 1900 ? 'container-default' : 'container-large'),
resize: false,
offset: 'auto',
shadeClose: false,

39
OrangeFormsOpen-VUE3/src/components/SpreadSheet/index.scss
View File

@@ -1,5 +1,5 @@
$css-prefix: x-spreadsheet;
// color
$red-color: #DB2828;
$red-hover-color: #d01919;
$orange-color: #F2711C;
@@ -29,7 +29,6 @@ $dark-hover-color: color-mix($dark-color, 10%);
$black-color: #1B1C1D;
$black-hover-color: #27292a;
// base
$border-style: 1px solid #e0e2e4;
$icon-size: 18px;
$line-height: 1.25em;
@@ -43,9 +42,6 @@ $form-field-height: 30px;
$primary-color: $blue-color;
$primary-hover-color: $blue-hover-color;
// method
.x-spreadsheet {
font-size: 13px;
font-family: Lato, 'Source Sans Pro', Roboto, Helvetica, Arial, sans-serif;
@@ -69,13 +65,11 @@ $primary-hover-color: $blue-hover-color;
}
.x-spreadsheet-table {
// html5 bottom margin bug
vertical-align: bottom;
}
.x-spreadsheet-tooltip {
position: absolute;
// 这个组件在全屏dialog中用，全局中有z值会比这个默认值高
z-index: 9999;
padding: 5px 10px;
font-size: 12px;
@@ -295,7 +289,6 @@ $primary-hover-color: $blue-hover-color;
}
}
&:hover {
// opacity: .85;
}
}
@@ -351,7 +344,7 @@ $primary-hover-color: $blue-hover-color;
border: 2px dashed rgb(75 137 255);
}
.x-spreadsheet-selector-autofill {
border: 1px dashed rgb(0 0 0 / 45%); // #606060; // rgba(0, 0, 0, .2);
border: 1px dashed rgb(0 0 0 / 45%);
}
.x-spreadsheet-selector-corner {
position: absolute;
@@ -425,10 +418,6 @@ $primary-hover-color: $blue-hover-color;
background: rgb(0 0 0 / 5%);
}
// &.active {
//// background: #89aef53d;
// }
&.divider {
height: 0;
padding: 0;
@@ -459,29 +448,12 @@ $primary-hover-color: $blue-hover-color;
width: 10px;
height: 10px;
background: rgb(0 0 0 / 8%);
// border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: 2px;
content: '';
}
}
&.state.checked::before {
background: #4b89ff;
// content: '';
// position: absolute;
// width: 5px;
// height: 12px;
// color: #4b89ff; // #353A41;
// border-left: none;
// border-top: none;
// border-bottom: 2px solid;
// border-right: 2px solid;
// left: 15px;
// top: 6px;
// background: none;
// border-radius: 0;
// transform-origin: center;
// transform: rotate(45deg);
// -webkit-transform: rotate(45deg);
}
}
@@ -765,8 +737,6 @@ $primary-hover-color: $blue-hover-color;
}
td > .cell {
// border: 1px solid rgba(0,0,0,.05);
&:hover {
background: #ecf6fd;
}
@@ -813,8 +783,6 @@ $primary-hover-color: $blue-hover-color;
color: rgb(0 0 0 / 60%);
background: #E0E1E2;
border-radius: 3px;
//box-shadow: 0px 1px 2px -1px rgba(255,255,255,0.5) inset, 0px -2px 0px 0px rgba(0,0,0,0.1) inset;
//box-shadow: 0 0 0 0 rgba(0,0,0,.5) inset;
outline: none;
transition: all 0.1s linear;
line-height: 1em;
@@ -839,7 +807,6 @@ $primary-hover-color: $blue-hover-color;
}
}
// form begin
.x-spreadsheet-form-input {
position: relative;
display: inline-flex;
@@ -896,7 +863,6 @@ $primary-hover-color: $blue-hover-color;
display: flex;
flex-flow: wrap;
flex-direction: row;
//flex-wrap: wrap;
.x-spreadsheet-form-field {
flex: 0 1 auto;
@@ -927,7 +893,6 @@ $primary-hover-color: $blue-hover-color;
color: #f04134;
}
}
// form end
.x-spreadsheet-dimmer {
position: absolute;
top: 0 !important;

2
OrangeFormsOpen-VUE3/src/components/UserSelect/index.vue
View File

@@ -71,7 +71,6 @@ const refreshData = (data: ANY_OBJECT) => {
}
};
const handlerEditOperate = (items: Ref<ANY_OBJECT>) => {
console.log('handlerEditOperate', items);
selectedItems.value = [];
if (pps.multiple) {
if (Array.isArray(items)) selectedItems.value = items;
@@ -79,7 +78,6 @@ const handlerEditOperate = (items: Ref<ANY_OBJECT>) => {
if (items != null) selectedItems.value.push(items);
}
if (!checkSelectChange()) return;
console.log('1111', selectedItems.value);
emitChange();
};
const onVisibleChange = (visible: boolean) => {

5
OrangeFormsOpen-VUE3/src/components/layout/components/SubMenu.vue
View File

@@ -23,7 +23,7 @@
}}</span>
</template>
<template v-for="child in menu.children" :key="child.menuId">
<sub-menu class="nest-menu" :index="child.menuId" :menu="child" :isChild="true" />
<sub-menu class="nest-menu" :menu="child" :isChild="true" />
</template>
</el-sub-menu>
</div>
@@ -63,10 +63,9 @@ const getTextStyle = (isShow: boolean) => {
.nest-menu :deep(.el-menu-item span:first-child),
.nest-menu :deep(.el-menu-item .menu-icon:first-child),
.nest-menu :deep(.el-submenu__title span:first-child) {
padding-left: 14px !important;
padding-left: 8px !important;
}
.nest-menu :deep(.el-submenu__title .menu-icon:first-child) {
margin-left: 8px !important;
}
</style>
@/types/upms/menu

1
OrangeFormsOpen-VUE3/src/components/layout/components/TagPanel.vue
View File

@@ -279,4 +279,3 @@ const rightClick = () => {
background: #eee;
}
</style>
@/types/upms/menu

1
OrangeFormsOpen-VUE3/src/components/layout/components/multi-column-menu.vue
View File

@@ -150,4 +150,3 @@ const select = () => {
}
}
</style>
@/types/upms/menu

1
OrangeFormsOpen-VUE3/src/components/layout/components/multi-column.vue
View File

@@ -140,4 +140,3 @@ watch(
}
}
</style>
@/types/upms/menu

7
OrangeFormsOpen-VUE3/src/components/layout/index.vue
View File

@@ -28,7 +28,7 @@
>
<i class="online-icon icon-message" style="font-size: 16px; color: #333" />
</el-badge>
<template v-slot:dropdown>
<template #dropdown>
<el-dropdown-menu style="min-width: 130px">
<el-dropdown-item class="user-dropdown-item" command="remindingMessage">
催办消息
@@ -57,7 +57,7 @@
>{{ (userInfo || {}).showName
}}<el-icon class="el-icon--right"><el-icon-arrow-down /></el-icon>
</span>
<template v-slot:dropdown>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item class="user-dropdown-item" command="modifyPassword"
>修改密码</el-dropdown-item
@@ -354,9 +354,6 @@ onBeforeUnmount(() => {
</script>
<style lang="scss">
//@import url('@/assets/style/element-variables.scss');
//$--color-primary: #f70;
.header {
z-index: 1;
.header-main {