bkui-vue 1.0.3-beta.7 → 1.0.3-beta.9

package/lib/components.js

@@ -23,7 +23,6 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-
 export { default as Alert } from './alert';
 export { default as AnimateNumber } from './animate-number';
 export { default as Affix } from './affix';
@@ -33,7 +32,6 @@ export { default as Breadcrumb } from './breadcrumb';
 export { default as Button } from './button';
 export { default as Card } from './card';
 export { default as Checkbox } from './checkbox';
-
 export { default as Collapse } from './collapse';
 export { default as Dialog } from './dialog';
 export { default as Exception } from './exception';
@@ -52,12 +50,10 @@ export { default as Select } from './select';
 export { default as Sideslider } from './sideslider';
 export { default as Steps } from './steps';
 export { default as Switcher } from './switcher';
-
 export { default as Table } from './table';
 export { default as Tag } from './tag';
 export { default as TagInput } from './tag-input';
 export { default as Divider } from './divider';
-
 export { default as Tab } from './tab';
 export { default as Message } from './message';
 export { default as InfoBox } from './info-box';

package/lib/dist.index.js

@@ -24,7 +24,6 @@
  * IN THE SOFTWARE.
  */
 import './styles';
-
 export { default } from './preset';
 export * from './components';
 export * from './directives';

package/lib/hooks.js

@@ -23,11 +23,4 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-export {
-  useGlobalConfig,
-  provideGlobalConfig,
-  useLocale,
-  usePrefix,
-  defaultRootConfig,
-  rootProviderKey,
-} from './config-provider';
+export { useGlobalConfig, provideGlobalConfig, useLocale, usePrefix, defaultRootConfig, rootProviderKey, } from './config-provider';

package/lib/index.js

@@ -24,7 +24,6 @@
  * IN THE SOFTWARE.
  */
 // import './styles';
-
 export { default } from './preset';
 export * from './components';
 export * from './directives';

package/lib/preset.js

@@ -23,31 +23,25 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-
-import { App } from 'vue';
-
-import { ConfigProviderProps, provideGlobalConfig } from './config-provider';
-
+import { provideGlobalConfig } from './config-provider';
 import * as components from './components';
-
-const createInstall =
-  (prefix = 'Bk') =>
-  (app, options) => {
+const createInstall = (prefix = 'Bk') => (app, options) => {
     const pre = app.config.globalProperties.bkUIPrefix || prefix;
     Object.keys(components).forEach(key => {
-      const component = components[key];
-      if ('install' in component) {
-        app.use(component, { prefix: pre });
-      } else {
-        app.component(pre + key, components[key]);
-      }
+        const component = components[key];
+        if ('install' in component) {
+            app.use(component, { prefix: pre });
+        }
+        else {
+            app.component(pre + key, components[key]);
+        }
     });
     if (options) {
-      provideGlobalConfig(options, app);
+        provideGlobalConfig(options, app);
     }
-  };
+};
 export default {
-  createInstall,
-  install: createInstall(),
-  version: '0.0.1',
+    createInstall,
+    install: createInstall(),
+    version: '0.0.1',
 };

package/lib/table/index.js

@@ -716,6 +716,9 @@ var TableColumnProp = {
   mounted: function mounted() {
     this.updateColumnDefine();
   },
+  updated: function updated() {
+    this.updateColumnDefineByParent();
+  },
   methods: {
     updateColumnDefine: function updateColumnDefine() {
       var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -2941,7 +2944,7 @@ var skipThisColumn = function skipThisColumn(columns, colIndex, row, rowIndex) {
   for (var i = colIndex; i > 0; i--) {
     var colspan = resolveColumnSpan(columns[i], i, row, rowIndex, 'colspan');
     if (colspan > 1) {
-      skip = colspan - 1 + i >= colIndex;
+      skip = colspan - 1;
       break;
     }
   }
@@ -6100,7 +6103,7 @@ function use_render_isSlot(s) {
     }
     return '';
   };
-  var getRowSpanConfig = function getRowSpanConfig(row, index, preRow, col, store) {
+  var getRowSpanConfig = function getRowSpanConfig(row, rowIndex, preRow, col, store) {
     var _store$get$get, _store$get;
     if (!store.has(row)) {
       store.set(row, new WeakMap());
@@ -6115,7 +6118,7 @@ function use_render_isSlot(s) {
       _ref$skipRowLen = _ref.skipRowLen,
       skipRowLen = _ref$skipRowLen === void 0 ? 0 : _ref$skipRowLen;
     var skipRow = false;
-    var rowspan = resolveColumnSpan(col, null, row, index, 'rowspan');
+    var rowspan = resolveColumnSpan(col, null, row, rowIndex, 'rowspan');
     if (skipRowLen > 1) {
       skipRowLen = skipRowLen - 1;
       skipRow = true;
@@ -6188,7 +6191,7 @@ function use_render_isSlot(s) {
             rowspan = _resolveCellSpan.rowspan;
           var _tableResp$getColumnA = tableResp.getColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SPAN),
             skipCol = _tableResp$getColumnA.skipCol;
-          var _ref2 = needRowSpan && !isChild ? getRowSpanConfig(row, index, preRow, column, rowSpanMap) : {
+          var _ref2 = needRowSpan && !isChild ? getRowSpanConfig(row, rowIndex, preRow, column, rowSpanMap) : {
               skipRow: false
             },
             skipRow = _ref2.skipRow;

package/lib/table/utils.d.ts

@@ -111,7 +111,7 @@ export declare const resolveCellSpan: (column: Column, colIndex: number, row: an
     colspan: any;
     rowspan: any;
 };
-export declare const skipThisColumn: (columns: Column[], colIndex: number, row: any, rowIndex: number) => boolean;
+export declare const skipThisColumn: (columns: Column[], colIndex: number, row: any, rowIndex: number) => number | false;
 export declare const getSortFn: (column: any, sortType: any, format?: any[]) => ((_a: any, _b: any) => boolean) | ((_a: any, _b: any) => number);
 export declare const getNextSortType: (sortType: string) => string;
 export declare const resolveSort: (sort: ISortPropShape, column: any, format?: any[]) => ({

package/lib/table-column/index.js

@@ -677,6 +677,9 @@ var TableColumnProp = {
   mounted: function mounted() {
     this.updateColumnDefine();
   },
+  updated: function updated() {
+    this.updateColumnDefineByParent();
+  },
   methods: {
     updateColumnDefine: function updateColumnDefine() {
       var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "1.0.3-beta.7",
+  "version": "1.0.3-beta.9",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",
@@ -34,7 +34,8 @@
     "build": "run-s build:dist build:lib",
     "build:site": "lerna run --stream --scope site build && cp -r ./site/views/ ./site/dist/views",
     "build:dist": "rimraf dist && lerna run --stream --scope cli dist",
-    "build:lib": "rimraf lib && lerna run --stream --scope cli lib",
+    "build:lib": "npm run build:preset && rimraf lib && lerna run --stream --scope cli lib && rimraf preset",
+    "build:preset": "rimraf preset && lerna run --stream --scope cli preset",
     "help:release": "lerna run --stream --scope cli release",
     "release": "yarn build && yarn help:release",
     "analyze:lib": "rimraf lib && lerna run --stream --scope cli lib -- -a",