From 2504ff3e6e7143d3afba45527ef00b173376f7f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 二月 2022 11:27:26 +0800
Subject: [PATCH] 2022-02-14
---
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 17 +++++++++++++++++
src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx | 16 +++++++++++++++-
src/tabviews/zshare/normalTable/index.jsx | 6 +++++-
3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 027503b..044156a 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -159,6 +159,9 @@
border: none;
box-shadow: none!important;
height: auto;
+ border-radius: 0;
+ position: unset;
+
.ant-input-number-handler-wrap {
display: none;
}
@@ -171,6 +174,20 @@
.editing_table_cell {
.ant-input {
padding: 0px;
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ border: 1px solid #1890ff;
+ }
+ .ant-input-number-input {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ border: 1px solid #1890ff;
}
.anticon {
color: #ff4d4f;
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index bc497d5..ee502f0 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -216,7 +216,11 @@
}
}
- _columns.push(cell)
+ if (item.type === 'action' && item.position === 'left') {
+ _columns.unshift(cell)
+ } else {
+ _columns.push(cell)
+ }
})
if (rowspans.length === 0) {
diff --git a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
index 6d701af..10844a5 100644
--- a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
@@ -21,7 +21,7 @@
required: true
},
{
- type: 'select',
+ type: 'radio',
key: 'Align',
label: this.props.dict['model.form.align'],
initVal: this.props.card.Align,
@@ -44,6 +44,20 @@
label: this.props.dict['model.form.columnWidth'],
initVal: this.props.card.Width,
required: true
+ },
+ {
+ type: 'radio',
+ key: 'position',
+ label: '鏄剧ず浣嶇疆',
+ initVal: this.props.card.position || 'right',
+ required: true,
+ options: [{
+ MenuID: 'right',
+ text: '鍙充晶'
+ }, {
+ MenuID: 'left',
+ text: '宸︿晶'
+ }]
}
]
}
--
Gitblit v1.8.0