Browse Source

Pull request #3649: BI-131636 fix: 【6.0.13分析文档迭代验收】分析文档,字体颜色默认值,少了16进制的内容

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'bfa073bfb7632393212737cb925d096d785b595a':
  BI-131636 fix: 【6.0.13分析文档迭代验收】分析文档,字体颜色默认值,少了16进制的内容
research/test
Dailer-刘荣歆 1 year ago
parent
commit
19ebd32779
  1. 12
      packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js
  2. 2
      packages/fineui/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
  3. 6
      packages/fineui/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js

12
packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js

@ -22,7 +22,13 @@ import { Label, Combo, TextItem } from "@/base";
import { PopupPanel } from "../layer"; import { PopupPanel } from "../layer";
import { CustomColorChooser } from "./colorchooser.custom"; import { CustomColorChooser } from "./colorchooser.custom";
import { ColorChooserPopup } from "./colorchooser.popup"; import { ColorChooserPopup } from "./colorchooser.popup";
import { ColorPickerEditor, ColorPicker, HexColorPicker } from "./colorpicker"; import {
ColorPickerEditor,
ColorPicker,
HexColorPicker,
SimpleHexColorPickerEditor,
HexColorPickerEditor
} from "./colorpicker";
/** /**
* @author windy * @author windy
@ -59,8 +65,8 @@ export class HexColorChooserPopup extends Widget {
extend( extend(
{ {
type: o.simple type: o.simple
? "bi.simple_hex_color_picker_editor" ? SimpleHexColorPickerEditor.xtype
: "bi.hex_color_picker_editor", : HexColorPickerEditor.xtype,
value: o.value, value: o.value,
height: o.simple ? 36 : 70, height: o.simple ? 36 : 70,
listeners: [ listeners: [

2
packages/fineui/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js

@ -39,7 +39,7 @@ export class HexColorPickerEditor extends Widget {
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";
props = { props = {
baseCls: "bi-color-picker-editor", baseCls: "bi-color-picker-editor bi-hex-color-picker-editor",
height: 30, height: 30,
}; };

6
packages/fineui/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js

@ -23,7 +23,8 @@ import { TextEditor } from "@/widget/editor/editor.text";
const RGB_WIDTH = 32, const RGB_WIDTH = 32,
HEX_WIDTH = 70, HEX_WIDTH = 70,
HEX_PREFIX_POSITION = 1; HEX_PREFIX_POSITION = 1,
DEFAULT_HEX = "ffffff";
/** /**
* @author windy * @author windy
@ -37,7 +38,7 @@ export class SimpleHexColorPickerEditor extends Widget {
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";
props = { props = {
baseCls: "bi-color-picker-editor", baseCls: "bi-color-picker-editor bi-simple-hex-color-picker-editor",
height: 36, height: 36,
}; };
@ -112,6 +113,7 @@ export class SimpleHexColorPickerEditor extends Widget {
errorText: i18nText("BI-Color_Picker_Error_Text_Hex"), errorText: i18nText("BI-Color_Picker_Error_Text_Hex"),
width: HEX_WIDTH, width: HEX_WIDTH,
height: 24, height: 24,
value: DEFAULT_HEX,
listeners: [ listeners: [
{ {
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",

Loading…
Cancel
Save