Merge remote-tracking branch 'origin/fbp/release' into fbp/release

designer-base/src/main/java/com/fine/theme/light/ui/FineComboCheckBoxUI.java

@@ -0,0 +1,37 @@
+package com.fine.theme.light.ui;
+
+import com.formdev.flatlaf.ui.FlatComboBoxUI;
+
+import javax.swing.JComponent;
+import javax.swing.UIManager;
+import javax.swing.plaf.ComponentUI;
+
+
+/**
+ * {@link com.fr.design.gui.icombocheckbox.UIComboCheckBox} 的 UI 样式
+ *
+ * @author lemon
+ * @since 12.0
+ * Created on 2024/09/27
+ */
+public class FineComboCheckBoxUI extends FlatComboBoxUI {
+
+    public FineComboCheckBoxUI() {
+        super();
+    }
+
+    /**
+     * 创建UI
+     */
+    public static ComponentUI createUI(JComponent c) {
+        return new FineComboCheckBoxUI();
+    }
+
+    @Override
+    public void installUI(JComponent c) {
+        super.installUI(c);
+        c.setBackground(UIManager.getColor("ComboCheckBox.background"));
+        c.setBorder(UIManager.getBorder("ComboCheckBox.border"));
+    }
+
+}

designer-base/src/main/java/com/fine/theme/light/ui/FineSliderUI.java

@@ -50,6 +50,11 @@ public class FineSliderUI extends FlatSliderUI {
         defaultLabelHeight = FineUIUtils.getAndScaleInt("Slider.labelHeight", DEFAULT_LABEL_HEIGHT);
     }
 
+    @Override
+    protected Color getTrackColor() {
+        return trackColor;
+    }
+
     @Override
     protected void calculateLabelRect() {
 

designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java

@@ -41,6 +41,7 @@ public interface FineUIStyle {
     String POPUP_MENU_TOOL_BAR = "popupMenuToolBar";
     String POPUP_MENU_DROPDOWN = "dropdownPopupMenu";
     String TRANSPARENT_TEXT_FIELD = "transparentTextField";
+    String OFFET_LEFT_TEXT_FIELD = "offsetLeftText";
     String TRANSPARENT_BACKGROUND = "transparentBackground";
     String PURE_LIST = "pureList";
     String NO_BORDER_LIST = "noBorderList";
@@ -51,6 +52,7 @@ public interface FineUIStyle {
     String DEFAULT_TABLE = "defaultTable";
     String WHITE_BUTTON = "whiteButton";
     String ORIGINAL_BUTTON = "originalButton";
+    String PLAIN_ARROW_BUTTON = "plainArrowButton";
     String GRAY_BUTTON = "grayButton";
     String DETAIL_LABEL = "detailLabel";
     String WIDGET_EVENT_LABEL = "widgetEventLabel";

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.datapane.preview.desensitization.view.setting;
 
 import com.fine.theme.icon.LazyIcon;
-import com.fine.theme.light.ui.FineRoundBorder;
 import com.fine.theme.utils.FineUIStyle;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.fr.data.desensitize.base.DesensitizationTableData;
@@ -14,7 +13,6 @@ import com.fr.design.data.datapane.preview.desensitization.view.rule.Desensitiza
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.icombobox.ComboCheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombocheckbox.UIComboCheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -39,7 +37,6 @@ import javax.swing.UIManager;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -57,6 +54,8 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
+import static com.fine.theme.utils.FineUIStyle.setStyle;
+
 /**
  * 处理TableDataDesensitizationTablePane中TableEditPane的Model
  *
@@ -367,12 +366,6 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
 
                 }
             });
-            setBoxStyle();
-        }
-
-        private void setBoxStyle() {
-            this.rolesCheckBox.setBorder(new FineRoundBorder());
-            FineUIStyle.setStyle(this.rolesCheckBox.getEditor(), FineUIStyle.TRANSPARENT_TEXT_FIELD);
         }
 
         @Override
@@ -433,7 +426,9 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
             protected void setLayoutAndAddComponents() {
                 // 使用BorderLayout，否则默认使用的FlowLayout会让整个下拉选框使用最小Size，然后TableCell这边会出现空白
                 this.setLayout(FRGUIPaneFactory.createBorderLayout());
-                this.add(getLabel(), BorderLayout.EAST);
+                JPanel pane = getClickPane();
+                pane.setOpaque(false);
+                this.add(pane, BorderLayout.CENTER);
             }
 
             @Override
@@ -457,7 +452,7 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
             // 规则状态
             this.ruleStatusLabel = new UILabel();
             this.ruleStatusLabel.setOpaque(true);
-            FineUIStyle.setStyle(ruleStatusLabel, FineUIStyle.LABEL_WARNING_TIP);
+            setStyle(ruleStatusLabel, FineUIStyle.LABEL_WARNING_TIP);
         }
 
         /**

designer-base/src/main/java/com/fr/design/data/tabledata/datacenter/DCTableDataJSBridge.java

@@ -6,6 +6,7 @@ import com.fr.datacenters.tabledata.bean.DCTableDataBean;
 import com.fr.datacenters.tabledata.filter.DCFilter;
 import com.fr.datacenters.tabledata.parameter.DCParameter;
 import com.fr.design.bridge.exec.JSBridge;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.formula.FormulaFactory;
@@ -135,6 +136,16 @@ public class DCTableDataJSBridge {
         }).setVisible(true);
     }
 
+    /**
+     * 当前所有数据集名称
+     */
+    @JSBridge
+    public void getDatasetNames(final JsFunction callback) {
+        JxUIPane.DEFAULT_EXECUTOR.submit(() ->
+                callback.invoke(window, EmbedJson.encode(
+                        DesignTableDataManager.getAllDSNames(DesignTableDataManager.getEditingTableDataSource()))));
+    }
+
     /**
      * 解析公式参数
      */

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java

@@ -31,6 +31,10 @@ import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.fix;
+import static com.fine.swing.ui.layout.Layouts.row;
+
 public class UICheckListPopup extends UIPopupMenu {
     private List<ActionListener> listeners = new ArrayList<ActionListener>();
     private List<JCheckBox> checkBoxList = new ArrayList<JCheckBox>();
@@ -120,15 +124,12 @@ public class UICheckListPopup extends UIPopupMenu {
     }
 
     private void addOneCheckValue(Object checkValue) {
-        JPanel checkPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        checkPane.setPreferredSize(FineUIScale.scale(new Dimension(144, CHECKBOX_HEIGHT)));
+        JPanel checkPane = new JPanel(new BorderLayout());
         final JCheckBox temp = createCheckbox();
         final UILabel label = new UILabel(checkValue.toString());
         label.setBackground(Color.WHITE);
-        label.setPreferredSize(FineUIScale.scale(new Dimension(100, 20)));
         checkPane.setBackground(Color.WHITE);
-        checkPane.add(temp);
-        checkPane.add(label);
+        checkPane.add(row(fix(4), cell(temp), cell(label)).getComponent());
         if (labelNeedToolTips) {
             // 设置每项Label的tooltips为其省略前的内容
             label.setToolTipText(checkValue.toString());

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java

@@ -2,19 +2,20 @@ package com.fr.design.gui.icombocheckbox;
 
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.light.ui.FineRoundBorder;
-import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIUtils;
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.event.HoverAware;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.Icon;
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -36,6 +37,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static com.fine.theme.utils.FineUIStyle.OFFET_LEFT_TEXT_FIELD;
+import static com.fine.theme.utils.FineUIStyle.PLAIN_ARROW_BUTTON;
+import static com.fine.theme.utils.FineUIStyle.TRANSPARENT_TEXT_FIELD;
+import static com.fine.theme.utils.FineUIStyle.setStyle;
+
 /**
  * 设计器下拉复选框组件
  * 支持全选、半选
@@ -43,10 +49,10 @@ import java.util.Map;
  * 可以省略显示
  *
  * @author
- * @since
- * Created on
+ * @since Created on
  */
-public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNameObserver, HoverAware {
+public class UIComboCheckBox extends JComboBox implements UIObserver, GlobalNameObserver, HoverAware {
+    private static final String UI_CLASS_ID = "ComboCheckBoxUI";
     //下拉框的值
     private Object[] values;
     //已经选中的值
@@ -55,8 +61,8 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
     private List<ActionListener> listeners = new ArrayList<ActionListener>();
     private UICheckListPopup popup;
     private UITextField editor;
+    private final JPanel clickPane = new JPanel(new BorderLayout());
     private UIButton arrowButton;
-    private UILabel label;
     //选中的值之间显示的分隔符
     private String valueSperator;
     private static final String DEFAULT_VALUE_SPERATOR = ",";
@@ -71,6 +77,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
     private String placeHolder = StringUtils.EMPTY;
 
     private boolean rollOver;
+    private boolean popupVisible = false;
 
     public UIComboCheckBox(Object[] value) {
         this(value, DEFAULT_VALUE_SPERATOR, true);
@@ -123,19 +130,22 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
     }
 
     private void initComponent() {
-        this.popup = new UICheckListPopup(values, supportSelectAll);
+        this.popup = new UICheckListPopup(values, supportSelectAll) {
+            @Override
+            public Dimension getPreferredSize() {
+                Dimension size = super.getPreferredSize();
+                size.width = UIComboCheckBox.this.getWidth();
+                return size;
+            }
+        };
+        this.popup.setBorder(new FineRoundBorder());
         this.popup.addActionListener(new PopupAction());
-        this.editor = createEditor();
-        this.arrowButton = createArrowButton();
-        this.label = new UILabel(getIcon());
-        label.setPreferredSize(FineUIScale.scale(new Dimension(24, 24)));
+        initClickPane();
 
         setLayoutAndAddComponents();
         setText();
 
         addPopupListener(this);
-        setBackground(Color.WHITE);
-        setOpaque(true);
     }
 
     /**
@@ -152,8 +162,8 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
         return popup;
     }
 
-    public UITextField getEditor() {
-        return editor;
+    public JPanel getClickPane() {
+        return clickPane;
     }
 
     public String getPlaceHolder() {
@@ -164,31 +174,37 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
         this.placeHolder = placeHolder;
     }
 
-    public UIButton getArrowButton() {
-        return arrowButton;
-    }
+    private void initClickPane() {
+        editor = new TextField();
+        editor.setEditable(false);
+        setStyle(editor, OFFET_LEFT_TEXT_FIELD);
 
-    public UILabel getLabel() {
-        return label;
-    }
+        arrowButton = new UIButton(getIcon());
+        setStyle(arrowButton, PLAIN_ARROW_BUTTON);
 
-    private UIButton createArrowButton() {
-        final UIButton arrowBtn = new UIButton();
-        arrowBtn.setNormalPainted(false);
-        arrowBtn.setPreferredSize(FineUIScale.scale(new Dimension(20, 5)));
-        arrowBtn.setIcon(getIcon());
-        arrowBtn.setExtraPainted(false);
-        addPopupListener(arrowBtn);
+        clickPane.add(editor, BorderLayout.CENTER);
+        clickPane.add(arrowButton, BorderLayout.EAST);
 
-        return arrowBtn;
+        addPopupListener(editor);
+        addPopupListener(arrowButton);
+        addHoverStatusListener(editor);
+        addHoverStatusListener(arrowButton);
     }
 
-    private UITextField createEditor() {
-        UITextField editor = new TextField();
-        editor.setEditable(false);
-        addPopupListener(editor);
+    protected void addHoverStatusListener(JComponent component) {
+        component.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                rollOver = true;
+                repaint();
+            }
 
-        return editor;
+            @Override
+            public void mouseExited(MouseEvent e) {
+                rollOver = popup.isVisible();
+                repaint();
+            }
+        });
     }
 
     /**
@@ -202,18 +218,6 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
             public void mouseClicked(MouseEvent e) {
                 togglePopup();
             }
-
-            @Override
-            public void mouseEntered(MouseEvent e) {
-                rollOver = true;
-                repaint();
-            }
-
-            @Override
-            public void mouseExited(MouseEvent e) {
-                rollOver = false;
-                repaint();
-            }
         });
 
     }
@@ -240,7 +244,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
 
     @Override
     public boolean isHovered() {
-        return rollOver || this.popup.isShowing();
+        return rollOver;
     }
 
     private class PopupAction implements ActionListener {
@@ -258,10 +262,32 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
 
     private void togglePopup() {
         if (this.arrowButton.isEnabled()) {
-            popup.setBorder(new FineRoundBorder());
-            popup.setPreferredSize(new Dimension(getWidth(), this.popup.getPreferredSize().height));
-            popup.show(this, 0, getHeight());
+            if (popupVisible) {
+                hidePopup();
+            } else {
+                showPopup();
+            }
+        }
+    }
+
+    /**
+     * 展示 popup
+     */
+    public void showPopup() {
+        this.popup.show(this, 0, getHeight());
+        arrowButton.setIcon(new LazyIcon("up_arrow"));
+        arrowButton.repaint();
+        popupVisible = true;
     }
+
+    /**
+     * 隐藏 popup
+     */
+    public void hidePopup() {
+        popup.setVisible(false);
+        arrowButton.setIcon(new LazyIcon("down_arrow"));
+        arrowButton.repaint();
+        popupVisible = false;
     }
 
     /**
@@ -301,6 +327,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
 
     /**
      * 为为添加placeholder
+     *
      * @param editor
      */
     protected void setEditorPlaceHolder(UITextField editor) {
@@ -335,7 +362,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
 
         for (int i = 1; i <= chars.length; i++) {
             //如果原文本+省略号长度超过文本框
-            if (fontMetrics.charsWidth(chars, 0, i) + omitLength > textEditor.getPreferredSize().getWidth()) {
+            if (fontMetrics.charsWidth(chars, 0, i) + omitLength > textEditor.getWidth()) {
                 //从第i-1的位置截断再拼上省略号
                 omitText = text.substring(0, i - 2) + OMIT_TEXT;
                 break;
@@ -466,8 +493,14 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
         }
     }
 
+    @Override
+    public String getUIClassID() {
+        return UI_CLASS_ID;
+    }
+
     /**
      * 简单的测试demo
+     *
      * @param args
      */
     public static void main(String args[]) {

designer-base/src/main/java/com/fr/design/mainframe/authority/JTemplateAuthorityChecker.java

@@ -1,29 +1,23 @@
 package com.fr.design.mainframe.authority;
 
 
-import com.fanruan.config.impl.data.ConnectionConfigProviderFactory;
-import com.fanruan.config.impl.data.TableDataConfigProviderFactory;
-import com.fr.base.CloneCollector;
 import com.fr.design.dialog.FineJOptionPane;
-
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.user.UserAuthority;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 
 
@@ -31,6 +25,7 @@ public class JTemplateAuthorityChecker {
     JTemplate<?, ?> jTemplate;
     Set<String> authConnectionNames;
     Set<String> authDatasetNames;
+    Set<String> templateDatasetNames;
     Map<String, ElementAuthorityChecker> checkerMap = new HashMap<>();
     Set<String> authFailConnectionNames = new HashSet<>();
     Set<String> authFailDatasetNames = new HashSet<>();
@@ -45,7 +40,12 @@ public class JTemplateAuthorityChecker {
     }
 
     private void initAuthNames() {
-        // 无需获取所有数据集和数据连接了，当前只能获取自己有权限的
+        // 无需获取所有服务器数据集和数据连接了，因为当前只能获取自己有权限的，只要拿一下模板数据集就行
+        templateDatasetNames = new HashSet<>();
+        Iterator<String> tableDataNameIterator = jTemplate.getTarget().getTableDataNameIterator();
+        while (tableDataNameIterator.hasNext()) {
+            templateDatasetNames.add(tableDataNameIterator.next());
+        }
         Map<String, Set<String>> authNamesMap = RemoteAuthorityRepository.getInstance().getAuthServerDataSetAndConnectionNames(WorkContext.getCurrent().getConnection().getUserName());
         if (authNamesMap != null) {
             //有权限的数据连接名称
@@ -87,6 +87,8 @@ public class JTemplateAuthorityChecker {
                 }
             }
         }
+        // 排除模板数据集的部分
+        authFailDatasetNames.removeAll(templateDatasetNames);
         FineLoggerFactory.getLogger().info("JTemplateAuthorityChecker check time consume:" + (System.currentTimeMillis() - s));
         return authFailConnectionNames.size() == 0 && authFailDatasetNames.size() == 0;
     }

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -6,6 +6,7 @@ import com.fr.base.GraphHelper;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
 import com.fr.design.border.FineBorderFactory;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
@@ -419,7 +420,7 @@ public class CustomIconPane extends BasicPane {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon"));
             browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button"));
-            nameTextField = new UITextField(20);
+            nameTextField = new UITextField();
             nameTextField.setPreferredSize(FineUIScale.createScaleDimension(172, 24));
 
             browseButton.addActionListener(e -> onBrowseButtonClicked(SwingUtilities.getWindowAncestor(EditIconDialog.this)));
@@ -446,16 +447,14 @@ public class CustomIconPane extends BasicPane {
             showImageLabel = new UILabel();
             showImageLabel.setPreferredSize(FineUIScale.createScaleDimension(50, 50));
 
-            JPanel centerPane = column(10,
-                    row(
-                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":")).weight(1.2),
-                            cell(nameTextField).weight(3)
+            JPanel centerPane = column(LayoutConstants.VERTICAL_GAP,
+                    row(40,
+                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":")),
+                            cell(nameTextField)
                     ),
-                    row(
-                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":")).weight(1.2),
-                            row(
-                                    cell(showImageLabel), column(fix(13), cell(browseButton), fix(13)).weight(1)
-                            ).weight(3)
+                    row(40,
+                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":")),
+                            row(cell(showImageLabel), column(fix(13), cell(browseButton), fix(13)).weight(1)).weight(1)
                     )
             ).getComponent();
             this.add(centerPane, BorderLayout.WEST);

designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java

@@ -5,6 +5,7 @@ import com.fr.base.theme.TemplateTheme;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.frpane.FontSizeComboPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.frpane.UIPercentDragPane;
 import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
@@ -67,7 +68,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
      * 控件背景和透明度配置面板
      */
     protected NewColorSelectBox widgetBgColorSelectBox;
-    protected UIPercentDragPane widgetBgAlphaDragPane;
+    protected UINumberDragPaneWithPercent widgetBgAlphaDragPane;
     /**
      * 图标颜色
      */
@@ -130,7 +131,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
         colorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
         colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR);
         widgetBgColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
-        widgetBgAlphaDragPane = new UIPercentDragPane();
+        widgetBgAlphaDragPane = new UINumberDragPaneWithPercent(0, 100, 1);
         initLineBox();
         borderRadiusSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
         iconColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);

designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties

@@ -5,6 +5,7 @@ CheckBoxUI=com.fine.theme.light.ui.FineCheckBoxUI
 CheckBoxMenuItemUI=com.formdev.flatlaf.ui.FlatCheckBoxMenuItemUI
 ColorChooserUI=com.formdev.flatlaf.ui.FlatColorChooserUI
 ComboBoxUI=com.fine.theme.light.ui.FineComboBoxUI
+ComboCheckBoxUI=com.fine.theme.light.ui.FineComboCheckBoxUI
 DesktopIconUI=com.formdev.flatlaf.ui.FlatDesktopIconUI
 DesktopPaneUI=com.formdev.flatlaf.ui.FlatDesktopPaneUI
 CalendarPaneUI=com.fine.theme.light.ui.FineCalendarPaneUI

designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@@ -147,6 +147,7 @@ tooltip.normal=#3F506A
 tooltip.disabled=#A3ADBD
 hover.deep=#e2fbe6
 fill.deep=#F6F9FE
+track.normal=#DADEE7
 
 #---- Button ----
 
@@ -324,6 +325,10 @@ ComboBox.comboHeight = 24
 ComboBox.selectBox.button.height = 22
 ComboBox.renderInset = 0,6,0,6
 
+#---- ComboCheckBox ----
+ComboCheckBox.background = $fill.normal
+ComboCheckBox.border = com.fine.theme.light.ui.FineRoundBorder
+
 #---- Component ----
 
 Component.focusWidth = 0
@@ -727,7 +732,7 @@ Slider.trackWidth = 2
 Slider.thumbSize = 12,12
 Slider.focusWidth=0
 Slider.trackValueColor=$brand.normal
-Slider.trackColor=$border.divider
+Slider.trackColor=$track.normal
 Slider.thumbColor=$fill.normal
 Slider.thumbBorderColor=$border.divider
 Slider.tickColor = @disabledForeground
@@ -1276,6 +1281,15 @@ chart.selectedBorderColor = #2576EF
     borderWidth : 0; \
     disabledBackground : fade($Button.background,0%);
 
+[style]Button.plainArrowButton=\
+    background : fade($Button.background,0%); \
+    margin: 4,4,4,4; \
+    borderWidth : 0; \
+    disabledBackground : fade($Button.background,0%); \
+    hoverBackground : null; \
+    selectedBackground : null; \
+    pressedBackground : null
+
 [style]CombinationButton.primary = \
     background : @BrandColor; \
     arc : 3
@@ -1328,6 +1342,11 @@ chart.selectedBorderColor = #2576EF
 [style]TextField.transparentTextField=\
     background: fade(@background, 0%); \
     border: null;
+
+[style]TextField.offsetLeftText=\
+    background: fade(@background, 0%); \
+    border: 0,6,0,0;
+
 [style]PopupMenu.dropdownPopupMenu=\
     background: fade(@background, 0%); \
     borderInsets: 0,0,0,0;

designer-base/src/test/java/com/fr/design/gui/storybook/components/ComboCheckBoxStoryBoard.java

@@ -0,0 +1,46 @@
+package com.fr.design.gui.storybook.components;
+
+import com.fr.design.gui.icombocheckbox.UIComboCheckBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.storybook.StoryBoard;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.stable.ArrayUtils;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.flex;
+
+public class ComboCheckBoxStoryBoard extends StoryBoard {
+    public ComboCheckBoxStoryBoard() {
+        super("下拉多选框");
+
+
+        add(
+                cell(new UILabel("普通状态")).with(this::h3),
+                cell(getComboCheckBox(ArrayUtils.toArray("测试1", "测试2", "测试3", "测试4"))),
+
+                cell(new UILabel("长文字状态")).with(this::h3),
+                cell(getComboCheckBox(ArrayUtils.toArray("测试长文字1测试长文字1测试长文字1测试长文字1测试长文字1测试长文字1测试长文字1",
+                        "测试长文字2测试长文字2测试长文字2测试长文字2测试长文字2测试长文字2测试长文字2",
+                        "测试长文字3测试长文字3测试长文字3测试长文字3测试长文字3测试长文字3测试长文字3",
+                        "测试长文字4测试长文字4测试长文字4测试长文字4测试长文字4测试长文字4测试长文字4"))),
+
+                flex()
+        );
+    }
+
+    private UIComboCheckBox getComboCheckBox(Object[] array) {
+        return new UIComboCheckBox(array, true) {
+            protected void setLayoutAndAddComponents() {
+                // 使用BorderLayout，否则默认使用的FlowLayout会让整个下拉选框使用最小Size，然后TableCell这边会出现空白
+                this.setLayout(FRGUIPaneFactory.createBorderLayout());
+                JPanel pane = getClickPane();
+                pane.setOpaque(false);
+                this.add(pane, BorderLayout.CENTER);
+            }
+        };
+    }
+
+}

designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java

@@ -11,6 +11,7 @@ import com.fanruan.carina.annotions.Start;
 import com.fanruan.carina.annotions.Stop;
 import com.fanruan.carina.annotions.Supplemental;
 import com.fanruan.config.ConfigProviderFactory;
+import com.fanruan.config.LocalConfigSource;
 import com.fanruan.config.realm.ConfigRealm;
 import com.fanruan.dao.context.DBContextProvider;
 import com.fanruan.dao.context.DBContextStarter;
@@ -64,12 +65,12 @@ import com.fr.intelli.record.Focus;
 import com.fr.intelli.record.FocusInterceptor;
 import com.fr.intelli.record.PerformancePoint;
 import com.fr.intelli.record.PerformancePointInterceptor;
+import com.fr.invoke.Reflect;
 import com.fr.io.base.ResourcePaths;
 import com.fr.io.repository.ResourceRepository;
 import com.fr.io.repository.ResourceRepositoryWrapper;
 import com.fr.io.utils.ResourceIOUtils;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.record.analyzer.AnalyzerConfiguration;
 import com.fr.record.analyzer.AnalyzerMutableGroup;
 import com.fr.record.analyzer.DBMetrics;
@@ -81,7 +82,6 @@ import com.fr.security.encryption.SystemEncryptionManager;
 import com.fr.security.encryption.core.EncryptionScaffold;
 import com.fr.security.encryption.provider.SecuritySeedProvider;
 import com.fr.security.encryption.storage.keys.LoadSeedSecurityKey;
-
 import com.fr.stable.StringUtils;
 import com.fr.stable.db.DBContext;
 import com.fr.stable.db.properties.FineMicroServicesDBProperties;
@@ -102,7 +102,6 @@ import com.fr.transaction.HibernateTransactor;
 import com.fr.transaction.RemoteTransactor;
 import com.fr.transaction.TransactorFactory;
 import com.fr.workspace.WorkContext;
-import com.fanruan.config.LocalConfigSource;
 import com.fr.workspace.server.repository.config.LocalConfigSourceShell;
 
 import java.net.URI;
@@ -247,9 +246,14 @@ public class DesignEnvComponent {
      */
     private void startLogger() {
         // 获取本地的日志级别配置
-        Log4jConfigFactory.getInstance().setRootLevel(Log4jConfig.getInstance().getRootLevel());
+        Level localLogPreferLevel = Log4jConfig.getInstance().getRootLevel();
+        // 刷新到本地配置
+        Log4jConfigFactory.getInstance().setRootLevel(localLogPreferLevel);
         URI uri = Log4jUtils.buildUserConfigURI(StringUtils.EMPTY);
         FRLogger.getLogger().config(uri);
+        // 刷新到carina的配置，防止 portal service 启动的时候覆盖了
+        // 配置对象都是默认都文件读取的，设计器本地启动的阶段反射修改一下
+        Reflect.on(Carina.properties(LoggerProperties.class)).set("level", localLogPreferLevel.name());
         // 日志配置更新的监听在FRLogger里面，fbp去掉了但是设计器本地还是需要这个监听的，初始化的时候监听一下
         listenConfig();
     }

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java

@@ -292,12 +292,7 @@ public class DesensitizationCellPane extends BasicBeanPane {
         protected void setLayoutAndAddComponents() {
             // 使用BorderLayout，否则默认使用的FlowLayout会让整个下拉选框使用最小Size，然后TableCell这边会出现空白
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
-            UITextField editor = getEditor();
-            UIButton arrowButton = getArrowButton();
-            setStyle(editor, TRANSPARENT_TEXT_FIELD);
-            setStyle(arrowButton, PLAIN_BUTTON);
-            this.add(editor, BorderLayout.CENTER);
-            this.add(arrowButton, BorderLayout.EAST);
+            this.add(getClickPane(), BorderLayout.CENTER);
         }
 
         @Override

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/UpdateDataWorker.java

@@ -1,10 +1,8 @@
 package com.fr.design.mainframe.cell.settingpane.desensitization.model;
 
-import com.fr.base.operator.org.OrganizationOperator;
-import com.fr.data.desensitize.rule.DesensitizationRuleManager;
 import com.fr.data.desensitize.rule.base.DesensitizationRule;
 import com.fr.data.desensitize.rule.base.DesensitizationRuleSource;
-import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
 import javax.swing.SwingWorker;
 import java.util.HashMap;
@@ -26,8 +24,8 @@ public class UpdateDataWorker extends SwingWorker<Map<String, Object>, Void> {
     @Override
     protected Map<String, Object> doInBackground() {
         Map<String, Object> result = new HashMap<>();
-        Map<String, String> allRoles = WorkContext.getCurrent().get(OrganizationOperator.class).getAllRoles4Desensitization();
-        Map<DesensitizationRuleSource, Map<String, DesensitizationRule>> allRules = DesensitizationRuleManager.getInstance().getAllRules();
+        Map<String, String> allRoles = RemoteAuthorityRepository.getInstance().getAllRoles4Desensitization();
+        Map<DesensitizationRuleSource, Map<String, DesensitizationRule>> allRules = RemoteAuthorityRepository.getInstance().getAllRoles().getSourceRuleMap();
 
         result.put(ROLE_KEY, allRoles);
         result.put(RULE_KEY, allRules);