diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/prewidget_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/prewidget_normal.svg
new file mode 100644
index 000000000..542c02c26
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/prewidget_normal.svg
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/refresh_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/refresh_normal.svg
new file mode 100644
index 000000000..4e3fd9c14
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/refresh_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/files_up_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/files_up_normal.svg
new file mode 100644
index 000000000..34cd6083a
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/files_up_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/control/edit_disable.svg b/designer-base/src/main/resources/com/fr/design/images/control/edit_disable.svg
new file mode 100644
index 000000000..9b001cfc5
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/control/edit_disable.svg
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/control/edit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/control/edit_normal.svg
new file mode 100644
index 000000000..291719452
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/control/edit_normal.svg
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/control/remove_disable.svg b/designer-base/src/main/resources/com/fr/design/images/control/remove_disable.svg
new file mode 100644
index 000000000..b57f9a853
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/control/remove_disable.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/control/remove_normal.svg b/designer-base/src/main/resources/com/fr/design/images/control/remove_normal.svg
new file mode 100644
index 000000000..b09268f45
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/control/remove_normal.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disable.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disable.svg
new file mode 100644
index 000000000..2d64f68f7
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disable.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/preview_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_normal.svg
new file mode 100644
index 000000000..7b0ea197d
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
index d306bb179..3fe126879 100644
--- a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
+++ b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
@@ -310,9 +310,9 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
// 单元格组要记录下之前的选中情况
private CellSelection oriCellSelection = null;
- private List newAdd = new ArrayList();
+ private List newAdd = new ArrayList<>();
- private List oldAdd = new ArrayList();
+ private List oldAdd = new ArrayList<>();
public SmartJTablePane4DB(KeyColumnTableModel model, ElementCasePane actionReportPane) {
this(model, actionReportPane, false);
@@ -433,7 +433,8 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (!allColumnRow.contains(columnRow.toString())) {
add.addColumnRow(columnRow);
}
-
+ // 重新更换区域框选单元格后 清理历史框选
+ oldAdd.clear();
}
if (add.getSize() > 0) {
@@ -459,10 +460,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
String value = cellElement.toString();
- if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
- add.addColumnRow(ColumnRow.valueOf(value));
+ ColumnRow columnRow = ColumnRow.valueOf(value);
+ if (!newAdd.contains(columnRow) && !allColumnRow.contains(value)) {
+ add.addColumnRow(columnRow);
}
- newAdd.add(value);
+ newAdd.add(columnRow);
}
if (cellElement == null) {
@@ -470,16 +472,14 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (!allColumnRow.contains(columnRow.toString())) {
add.addColumnRow(columnRow);
}
- newAdd.add(columnRow.toString());
+ newAdd.add(columnRow);
}
}
}
- int oldSize = oldAdd.size();
- int newSize = newAdd.size();
- if (oldSize > newSize && oldAdd.containsAll(newAdd)) {
- int diff = oldSize - newSize;
- newValue.splice(newValue.getSize() - diff, diff);
- }
+ // 计算出前后两次选中的差值
+ oldAdd.removeAll(newAdd);
+ // 移除差值部分
+ newValue.removeAll(oldAdd);
oldAdd.clear();
oldAdd.addAll(newAdd);
}