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

4 years ago · 046b501926
34 changed files with 62 additions and 61 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.ie.min.js.map
+++ b/dist/2.0/fineui.ie.min.js.map
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-1-11 11:40:26 */
+/*! time: 2021-1-12 19:00:21 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -44456,8 +44456,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
            default:
                break;
        }
-        if(BI.isNull(value.dateType)) {
-            valueMap.position = self.position || BI.DynamicDateCard.OFFSET.CURRENT;
+        if (BI.isNull(value.dateType)) {
+            valueMap.position = this.position || BI.DynamicDateCard.OFFSET.CURRENT;
        }
        return valueMap;
    },
@ -75408,7 +75408,7 @@ BI.prepares.push(function () {
                            } else {
                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW);
                            }
-                            pos.dir = "bottom," + pos.dir;
+                            pos.dir = "top," + pos.dir;
                            if (lrFirst) {
                                pos.change = "top";
                            }
--- a/dist/2.0/fineui.js.map
+++ b/dist/2.0/fineui.js.map
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/2.0/fineui.min.js.map
+++ b/dist/2.0/fineui.min.js.map
--- a/dist/2.0/fineui_without_normalize.css
+++ b/dist/2.0/fineui_without_normalize.css
--- a/dist/2.0/fineui_without_normalize.min.css
+++ b/dist/2.0/fineui_without_normalize.min.css
--- a/dist/core.css
+++ b/dist/core.css
--- a/dist/core.js
+++ b/dist/core.js
@ -1,4 +1,4 @@
-/*! time: 2021-1-11 11:40:26 */
+/*! time: 2021-1-12 19:00:21 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -44456,8 +44456,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
            default:
                break;
        }
-        if(BI.isNull(value.dateType)) {
-            valueMap.position = self.position || BI.DynamicDateCard.OFFSET.CURRENT;
+        if (BI.isNull(value.dateType)) {
+            valueMap.position = this.position || BI.DynamicDateCard.OFFSET.CURRENT;
        }
        return valueMap;
    },
@ -75408,7 +75408,7 @@ BI.prepares.push(function () {
                            } else {
                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW);
                            }
-                            pos.dir = "bottom," + pos.dir;
+                            pos.dir = "top," + pos.dir;
                            if (lrFirst) {
                                pos.change = "top";
                            }
--- a/dist/core.js.map
+++ b/dist/core.js.map
--- a/dist/demo.css
+++ b/dist/demo.css
--- a/dist/demo.js
+++ b/dist/demo.js
@ -1,4 +1,4 @@
-/*! time: 2021-1-11 11:40:26 */
+/*! time: 2021-1-12 19:00:21 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -44456,8 +44456,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
            default:
                break;
        }
-        if(BI.isNull(value.dateType)) {
-            valueMap.position = self.position || BI.DynamicDateCard.OFFSET.CURRENT;
+        if (BI.isNull(value.dateType)) {
+            valueMap.position = this.position || BI.DynamicDateCard.OFFSET.CURRENT;
        }
        return valueMap;
    },
@ -75408,7 +75408,7 @@ BI.prepares.push(function () {
                            } else {
                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW);
                            }
-                            pos.dir = "bottom," + pos.dir;
+                            pos.dir = "top," + pos.dir;
                            if (lrFirst) {
                                pos.change = "top";
                            }
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/dist/fineui.css
+++ b/dist/fineui.css
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.ie.min.js.map
+++ b/dist/fineui.ie.min.js.map
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-1-11 11:40:26 */
+/*! time: 2021-1-12 19:00:21 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -44456,8 +44456,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
            default:
                break;
        }
-        if(BI.isNull(value.dateType)) {
-            valueMap.position = self.position || BI.DynamicDateCard.OFFSET.CURRENT;
+        if (BI.isNull(value.dateType)) {
+            valueMap.position = this.position || BI.DynamicDateCard.OFFSET.CURRENT;
        }
        return valueMap;
    },
@ -75408,7 +75408,7 @@ BI.prepares.push(function () {
                            } else {
                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW);
                            }
-                            pos.dir = "bottom," + pos.dir;
+                            pos.dir = "top," + pos.dir;
                            if (lrFirst) {
                                pos.change = "top";
                            }
--- a/dist/fineui.js.map
+++ b/dist/fineui.js.map
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui.min.js.map
+++ b/dist/fineui.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2021-1-11 11:40:26 */
+/*! time: 2021-1-12 19:00:21 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -40483,8 +40483,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
            default:
                break;
        }
-        if(BI.isNull(value.dateType)) {
-            valueMap.position = self.position || BI.DynamicDateCard.OFFSET.CURRENT;
+        if (BI.isNull(value.dateType)) {
+            valueMap.position = this.position || BI.DynamicDateCard.OFFSET.CURRENT;
        }
        return valueMap;
    },
--- a/dist/fineui_without_jquery_polyfill.js.map
+++ b/dist/fineui_without_jquery_polyfill.js.map
--- a/dist/font.css
+++ b/dist/font.css
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2021-1-11 11:40:26 */
+/*! time: 2021-1-12 19:00:21 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20210111114157",
+  "version": "2.0.20210112190227",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/core/platform/web/dom.js
+++ b/src/core/platform/web/dom.js
@ -678,7 +678,7 @@
                            } else {
                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW);
                            }
-                            pos.dir = "bottom," + pos.dir;
+                            pos.dir = "top," + pos.dir;
                            if (lrFirst) {
                                pos.change = "top";
                            }
--- a/src/less/base/combo/popup.bubble.less
+++ b/src/less/base/combo/popup.bubble.less
@ -3,7 +3,8 @@
 .bi-bubble-popup-view {
  .box-shadows(0px 9px 28px 8px rgba(0, 0, 0, 0.05), 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12));

-  &.bi-popup-view .list-view-shadow {
+  // 只去掉bubble-popup子元素的阴影
+  &.bi-popup-view > .list-view-shadow {
    .box-shadow(none);
  }
 }
--- a/src/widget/dynamicdate/dynamicdate.card.js
+++ b/src/widget/dynamicdate/dynamicdate.card.js
@ -301,8 +301,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
            default:
                break;
        }
-        if(BI.isNull(value.dateType)) {
-            valueMap.position = self.position || BI.DynamicDateCard.OFFSET.CURRENT;
+        if (BI.isNull(value.dateType)) {
+            valueMap.position = this.position || BI.DynamicDateCard.OFFSET.CURRENT;
        }
        return valueMap;
    },