Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221028145548",
+  "version": "2.0.20221031101438",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

src/base/single/instruction/instruction.js

@@ -0,0 +1,76 @@
+BI.Instruction = BI.inherit(BI.Widget, {
+    _defaultConfig: function () {
+        var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
+        return BI.extend(conf, {
+            baseCls: (conf.baseCls || "") + " bi-instruction",
+            height: 20,
+            level: "error",
+            textAlign: "left",
+            whiteSpace: "nowrap",
+            hgap: 5
+        });
+    },
+
+    render: function () {
+        var self = this, o = this.options;
+
+        return {
+            type: "bi.label",
+            ref: function (_ref) {
+                self.text = _ref;
+            },
+            cls: "instruction-" + o.level,
+            textAlign: o.textAlign,
+            whiteSpace: o.whiteSpace,
+            textHeight: o.height,
+            height: o.height,
+            hgap: o.hgap,
+            rgap: o.rgap,
+            lgap: o.lgap,
+            vgap: o.vgap,
+            text: o.text,
+            keyword: o.keyword,
+            value: o.value,
+            py: o.py
+        };
+    },
+
+    doRedMark: function () {
+        this.text.doRedMark.apply(this.text, arguments);
+    },
+
+    unRedMark: function () {
+        this.text.unRedMark.apply(this.text, arguments);
+    },
+
+    doHighLight: function () {
+        this.text.doHighLight.apply(this.text, arguments);
+    },
+
+    unHighLight: function () {
+        this.text.unHighLight.apply(this.text, arguments);
+    },
+
+    setText: function (v) {
+        this.options.text = v;
+        this.text.setText(v);
+    },
+
+    getText: function () {
+        return this.options.text;
+    },
+
+    setStyle: function (css) {
+        this.text.setStyle(css);
+    },
+
+    setValue: function (v) {
+        this.text.setValue(v);
+    },
+
+    getValue: function () {
+        this.text.getValue();
+    }
+});
+
+BI.shortcut("bi.instruction", BI.Instruction);

src/case/layer/panel.js

@@ -11,22 +11,21 @@ BI.Panel = BI.inherit(BI.Widget, {
             titleHeight: 30,
             titleButtons: [],
             el: {},
-            logic: {
+            // logic: {
-                dynamic: false
+            //     dynamic: false
-            }
+            // }
         });
     },
 
-    _init: function () {
+    render: function () {
         BI.Panel.superclass._init.apply(this, arguments);
         var o = this.options;
 
-        BI.createWidget(BI.extend({
+        return {
-            element: this
+            type: "bi.vertical_fill",
-        }, BI.LogicFactory.createLogic("vertical", BI.extend(o.logic, {
+            rowSize: ["", "fill"],
-            items: BI.LogicFactory.createLogicItemsByDirection("top", this._createTitle()
+            items: [this._createTitle(), this.options.el]
-                , this.options.el)
+        };
-        }))));
     },
 
     _createTitle: function () {
@@ -56,18 +55,18 @@ BI.Panel = BI.inherit(BI.Widget, {
         });
 
         return {
-            el: {
+            // el: {
-                type: "bi.left_right_vertical_adapt",
+            type: "bi.left_right_vertical_adapt",
-                cls: "panel-title bi-header-background bi-border-bottom",
+            cls: "panel-title bi-header-background bi-border-bottom",
-                height: BI.toPix(o.titleHeight, 1),
+            height: BI.toPix(o.titleHeight, 1),
-                items: {
+            items: {
-                    left: [this.text],
+                left: [this.text],
-                    right: [this.button_group]
+                right: [this.button_group]
-                },
-                lhgap: 10,
-                rhgap: 10
             },
-            height: BI.toPix(o.titleHeight, 1)
+            lhgap: 10,
+            rhgap: 10
+            // },
+            // height: BI.toPix(o.titleHeight, 1)
         };
     },
 

src/less/base/single/instruction.less

@@ -0,0 +1,31 @@
+@import "../../index.less";
+
+.bi-instruction {
+  .border-radius(2px);
+
+  &.instruction-error{
+    background: @color-bi-background-bubble-error;
+    color: @color-bi-text-failure;
+  }
+
+  &.instruction-common{
+    background: @color-bi-background-bubble-normal;
+    color: @color-bi-text-highlight;
+  }
+
+  &.instruction-success{
+    background: @color-bi-background-bubble-success;
+    color: @color-bi-text-success;
+  }
+
+  &.instruction-warning{
+    background: @color-bi-background-bubble-warning;
+    color: @color-bi-text-redmark;
+  }
+}
+
+.bi-theme-dark {
+  .bi-instruction.instruction-error {
+    background: @color-bi-background-bubble-error-theme-dark;
+  }
+}

src/less/base/single/tip/tip.bubble.less

@@ -9,10 +9,6 @@
     color: @color-bi-text-failure;
   }
 
-  .bi-theme-dark &.bubble-error {
-    background: @color-bi-background-bubble-error-theme-dark;
-  }
-
   &.bubble-common{
     background: @color-bi-background-bubble-normal;
     color: @color-bi-text-highlight;
@@ -28,3 +24,9 @@
     color: @color-bi-text-redmark;
   }
 }
+
+.bi-theme-dark {
+  .bi-bubble.bubble-error {
+    background: @color-bi-background-bubble-error-theme-dark;
+  }
+}