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

bi.lessconfig.json

@@ -22,6 +22,9 @@
   "@color-bi-border-radio": "rgba(9, 30, 64, 0.37)",
   "@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)",
   "@color-bi-background-active-radio-content": "#2C60DB",
+  "@color-bi-border-checkbox-theme-dark": "rgba(255, 255, 255, 0.37)",
+  "@color-bi-border-hover-active-radio-theme-dark": "#3869DC",
+  "@color-bi-background-active-radio-content-theme-dark": "#3869DC",
   "@color-bi-background-disabled-active-radio-content": "#FFFFFF",
   "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
   "@color-bi-background-disabled-active-checkbox-content": "#FFFFFF",
@@ -39,7 +42,10 @@
   "@color-bi-color-toast-text": "#000A19",
   "@color-bi-text-header-background": "rgba(9, 30, 64, 0.9)",
   "@color-bi-text-header-background-theme-dark": "rgba(255, 255, 255, 0.9)",
-  "@font-down-triangle": "e70b",
   "@font-date": "e733",
-  "@font-trigger-triangle": "e924"
+  "@font-trigger-triangle": "e924",
+  "@font-solid-bottom": "e905",
+  "@font-solid-right": "e906",
+  "@font-dot": "e762",
+  "@font-down-triangle": "e70b"
 }

demo/js/widget/downlist/demo.downlist.js

@@ -47,11 +47,9 @@ Demo.Downlist = BI.inherit(BI.Widget, {
                 width: 100,
                 items: [
                     [{
-                        el: {
                         text: "column 1111",
                         iconCls1: "dot-e-font",
-                            value: 12
+                        value: 12,
-                        },
                         children: [{
                             text: "column 1.1",
                             value: 21,
@@ -166,13 +164,11 @@ Demo.Downlist = BI.inherit(BI.Widget, {
                 }],
                 items: [
                     [{
-                        el: {
                         text: "选项一",
                         value: 1,
                         icon: {
                             type: "demo.downlist.icon",
                         },
-                        },
                         children: [{
                             text: "选项一",
                             value: 11,

package.json

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

src/base/grid/grid.js

@@ -97,6 +97,12 @@ BI.GridView = BI.inherit(BI.Widget, {
         }
     },
     
+    destroyed: function () {
+        BI.each(this.renderedCells, function(i, cell) {
+            cell.el._destroy();
+        })
+    },
+
     _calculateSizeAndPositionData: function () {
         var o = this.options;
         this.rowCount = 0;

src/core/4.widget.js

@@ -360,6 +360,7 @@
             var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode();
             var render = BI.isFunction(this.options.render) ? this.options.render : (workerMode ? (this.$render || this.render) : this.render);
             var els = render && render.call(this);
+            els = this.options.configRender ? this.options.configRender(els) : els;
             els = BI.Plugin.getRender(this.options.type, els);
             if (BI.isPlainObject(els)) {
                 els = [els];

src/widget/downlist/combo.downlist.js

@@ -1,7 +1,35 @@
-/**
+(function() {
+    function transformItems(items) {
+        if (!items) return items;
+        var result = BI.cloneDeep(items);
+        var isComplexItmes = BI.some(items, function (_, item) {
+            return BI.isArray(item);
+        });
+        // 传一维数组，帮转二维
+        if (!isComplexItmes) {
+            result = [result];
+        }
+        // 帮转 el
+        BI.each(result, function (_, arr) {
+            BI.each(arr, function (_, item) {
+                if (item.children && !item.el) {
+                    item.el = {
+                        text: item.text,
+                        icon: item.icon,
+                        cls: item.cls,
+                        iconCls1: item.iconCls1,    
+                        value: item.value
+                    };
+                }
+            });
+        });
+        return result;
+    }
+    
+    /**
      * Created by roy on 15/8/14.
      */
-BI.DownListCombo = BI.inherit(BI.Widget, {
+    BI.DownListCombo = BI.inherit(BI.Widget, {
         _defaultConfig: function () {
             return BI.extend(BI.DownListCombo.superclass._defaultConfig.apply(this, arguments), {
                 baseCls: "bi-down-list-combo",
@@ -47,7 +75,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
                         ref: function (ref) {
                             self.popupView = ref;
                         },
-                    items: o.items,
+                        items: transformItems(o.items),
                         chooseType: o.chooseType,
                         value: o.value,
                         listeners: [{
@@ -102,9 +130,10 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
         adjustHeight: function () {
             this.downlistcombo.adjustHeight();
         }
-});
+    });
-BI.DownListCombo.EVENT_CHANGE = "EVENT_CHANGE";
+    BI.DownListCombo.EVENT_CHANGE = "EVENT_CHANGE";
-BI.DownListCombo.EVENT_SON_VALUE_CHANGE = "EVENT_SON_VALUE_CHANGE";
+    BI.DownListCombo.EVENT_SON_VALUE_CHANGE = "EVENT_SON_VALUE_CHANGE";
-BI.DownListCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
+    BI.DownListCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
     
-BI.shortcut("bi.down_list_combo", BI.DownListCombo);
+    BI.shortcut("bi.down_list_combo", BI.DownListCombo);
+}());