Merge pull request #3836 in DESIGN/design from feature/10.0 to feature/x

* commit 'f09f3f8cff1fe638d250f1d2571de32dee2c3168':
  无jira任务，处理冲突
  REPORT-50191 设计器-服务器数据集-左下角图标变化失效 【问题原因】REPORT-49782任务中补充图标的时候，图标名称写错了，导致没识别出来 【改动思路】修改图标名称
  CHART-18080 变量名更换
  CHART-18080 修复数字输入框输入中文时自动删除数字问题

designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java

@@ -5,11 +5,15 @@ import com.fr.general.ComparatorUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StringUtils;
 
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
 import java.awt.Dimension;
 import java.awt.Toolkit;
+import java.awt.event.InputMethodEvent;
+import java.awt.event.InputMethodListener;
 
 /**
  * Number Field.
@@ -35,6 +39,11 @@ public class UINumberField extends UITextField {
 
     private boolean isContentChanged = false;
     private boolean fillNegativeNumber = true;
+    /**
+     * 输入法输入完成一个字符输入过程的标记。开始输入的时候是true，输入完矫正光标后为false
+     */
+    private boolean isInputMethodOnceInserting = false;
+    private int insertOffset = 0;
 
     public UINumberField() {
         this(MAX_INTEGERLENGTH_32, MAX_DECIMALLENGTH);
@@ -55,6 +64,7 @@ public class UINumberField extends UITextField {
         this.minValue = minValue;
         this.maxValue = maxValue;
         setFieldDocument();
+        initFieldListener();
     }
 
     public void setFieldDocument() {
@@ -62,6 +72,31 @@ public class UINumberField extends UITextField {
         initListener();
     }
 
+    private void initFieldListener() {
+        addInputMethodListener(new InputMethodListener() {
+            @Override
+            public void inputMethodTextChanged(InputMethodEvent event) {
+                isInputMethodOnceInserting = true;
+            }
+
+            @Override
+            public void caretPositionChanged(InputMethodEvent event) {
+            }
+        });
+
+        addCaretListener(new CaretListener() {
+            @Override
+            public void caretUpdate(CaretEvent e) {
+                if (isInputMethodOnceInserting) {
+                    isInputMethodOnceInserting = false;
+                    setCaretPosition(insertOffset);
+                } else {
+                    insertOffset = e.getDot();
+                }
+            }
+        });
+    }
+
     public void canFillNegativeNumber(boolean fillNegativeNumber) {
         this.fillNegativeNumber = fillNegativeNumber;
     }
@@ -186,6 +221,13 @@ public class UINumberField extends UITextField {
             super.insertString(offset, s, a);
         }
 
+        public void remove(int offs, int len) throws BadLocationException {
+            if (isInputMethodOnceInserting) {
+                return;
+            }
+            super.remove(offs, len);
+        }
+
         // kunsnat: 这种限制输入 有个不好的地方, 比如删除时: 10.1  最大值限定100, 那么就删除中间的小数点之后变为101, 超出了100.
         // 但是直接限制不能删除中间类似小数点, 那么也可能遇到: 最小值10 , 从100变化到其中的19, 就很难..
         private boolean notChange(String strNew) {

designer-base/src/main/resources/com/fr/design/images/control/edit_disable.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_编辑_disable</title>
-    <g id="icon_编辑_disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.299107143">
-        <path d="M9.95422984,2.34704298 L13.4897637,5.88257688 L6.18790578,13.1844348 L0.884604926,14.9522018 L2.65237188,9.64890094 L9.95422984,2.34704298 Z M13.4897637,1.6399362 L14.1968705,2.34704298 C14.9368113,3.08698374 14.9757555,4.2624679 14.3137033,5.04825533 L14.1968705,5.1754701 L10.6613366,1.6399362 C11.4423852,0.858887612 12.7087152,0.858887612 13.4897637,1.6399362 Z" id="形状结合" fill="#333334"></path>
-        <rect id="矩形" fill="#333334" x="7" y="14" width="7" height="1"></rect>
-    </g>
-</svg>

designer-base/src/main/resources/com/fr/design/images/control/remove_disable.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_删除_normal</title>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
-        <g id="工具栏/导入数据集" transform="translate(-78.000000, -7.000000)" fill="#333334">
-            <g id="icon_删除_normal" transform="translate(77.000000, 6.000000)">
-                <path d="M11,1 L11,3 L15,3 L15,4 L13,4 L13,15 L3,15 L3,4 L1,4 L1,3 L5,3 L5,1 L11,1 Z M12,4 L4,4 L4,14 L12,14 L12,4 Z M7,6 L7,12 L6,12 L6,6 L7,6 Z M10,6 L10,12 L9,12 L9,6 L10,6 Z M10,2 L6,2 L6,3 L10,3 L10,2 Z" id="Combined-Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/preview_disable.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="14px" viewBox="0 0 12 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_报表web属性_打印预览_normal</title>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
-        <g id="工具栏/导入数据集" transform="translate(-116.000000, -7.000000)" fill="#333334">
-            <g id="icon_报表web属性_打印预览_normal" transform="translate(114.000000, 6.000000)">
-                <path d="M9.5,7 C11.432875,7 13,8.567125 13,10.5 C13,11.1075915 12.845147,11.679042 12.5727578,12.1770349 C12.6203353,12.2075319 12.6650188,12.2450114 12.7069,12.287 L13.7129,13.293 C14.1039,13.684 14.1039,14.316 13.7129,14.707 C13.5179,14.902 13.2619,15 13.0059,15 C12.7499,15 12.4939,14.902 12.2989,14.707 L11.2929,13.701 C11.251507,13.6597129 11.2144961,13.6157024 11.1818672,13.5695439 C10.6844106,13.8436886 10.110446,14 9.5,14 C7.567125,14 6,12.432875 6,10.5 C6,8.567125 7.567125,7 9.5,7 Z M10,1 L14,5 L14,8 L13,8 L13,6 L9,6 L9,2 L3,2 L3,14 L7,14 L7,15 L2,15 L2,1 L10,1 Z M9.5,8 C10.8783333,8 12,9.12166667 12,10.5 C12,11.8783333 10.8783333,13 9.5,13 C8.12166667,13 7,11.8783333 7,10.5 C7,9.12166667 8.12166667,8 9.5,8 Z M12.587,5 L10,2.414 L10,5 L12.587,5 Z" id="Combined-Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>