@king-design/intact 2.0.4 → 2.0.5

package/components/table/cell.ts

@@ -39,6 +39,10 @@ export class TableCell extends Component<TableCellProps> {
                 isSame = false;
                 break;
             }
+            if (key === 'props' && nextProps.props.$blocks) {
+                isSame = false;
+                break;
+            }
         }
 
         if (!isSame) {

package/components/table/demos/basic.md

@@ -7,10 +7,16 @@ order: 0
 组件定义表格结构，详见”定义表格结构“说明
 
 ```vdt
-import {Table, TableColumn} from 'kpc';
+import {Table, TableColumn, Select, Option} from 'kpc';
 
 <Table data={this.get('data')} resizable>
-    <TableColumn key="a" title="Title 1" />
+    <TableColumn key="a" title="Title 1">
+        <b:template args="[data]">
+            <Select>
+                <Option value="a">test</Option>
+            </Select>
+        </b:template>
+    </TableColumn>
     <TableColumn key="b" title="Title 2" />
 </Table>
 ```

package/components/table/index.spec.ts

@@ -521,58 +521,42 @@ describe('Table', () => {
         expect(instance.get('checkedKeys')).to.eql([3, 4, 1, 2]);
     });
 
-    // it('should render dropdown in header of fixed table correctly in Vue', async () => {
-        // const Demo = {
-            // template: `
-                // <Table :data="data" style="width: 800px;">
-                    // <TableColumn key="a" width="300" fixed="left" />
-                    // <TableColumn key="b" width="300">
-                        // <template slot="title">
-                            // <Dropdown trigger="click" :container="dom => dom.parentElement.closest('.k-table')">
-                                // <Icon class="ion-ios-arrow-down" style="margin-left: 100px;" />
-                                // <DropdownMenu>
-                                    // <DropdownItem>1</DropdownItem>
-                                    // <DropdownItem>2</DropdownItem>
-                                    // <DropdownItem>3</DropdownItem>
-                                // </DropdownMenu>
-                            // </Dropdown>
-                        // </template>
-                    // </TableColumn>
-                    // <TableColumn key="c" width="300" fixed="right" />
-                // </Table>
-            // `,
-            // components: {
-                // Table,
-                // TableColumn,
-                // Dropdown,
-                // DropdownMenu,
-                // DropdownItem,
-                // Icon,
-            // },
-            // data() {
-                // return {
-                    // data: [
-                        // {a: 1, b: 1, c: 1},
-                        // {a: 2, b: 2, c: 2},
-                    // ],
-                // };
-            // }
-        // };
-        // const container = document.createElement('div');
-        // document.body.appendChild(container);
-        // const app = new Vue({
-            // render: h => h('Demo'),
-            // components: {
-                // Demo
-            // }
-        // }).$mount(container);
-
-        // // should show the first dropdown menu
-        // app.$el.querySelector('.k-icon').click();
-        // const dropdownMenu = app.$el.querySelectorAll('.k-dropdown-menu')[0];
-        // expect(dropdownMenu.style.display).to.eql('');
-
-        // app.$destroy();
-        // document.body.removeChild(app.$el);
-    // });
+    it('should update children in TableCell', async() => {
+        const update = sinon.spy();
+        class Test extends Component {
+            static template = `<div>test</div>`;
+            beforeUpdate() {
+                update();
+            }
+        }
+        class Demo extends Component<{data: any[], checkedKeys: number[]}> {
+            static template = `
+                const {Table, TableColumn, Test} = this;
+                <Table data={this.get('data')} ref="table">
+                    <TableColumn key="a">
+                        <b:template>
+                            <Test />
+                        </b:template>
+                    </TableColumn>
+                </Table>
+            `;
+            static defaults() {
+                return {
+                    data: [
+                        {a: 1},
+                        {a: 2},
+                    ],
+                };
+            }
+            private Table = Table;
+            private TableColumn = TableColumn;
+            private Test = Test;
+        }
+       
+        const [instance, element] = mount(Demo);
+        element.querySelector<HTMLElement>('tbody tr')!.click();
+
+        await wait();
+        expect(update.callCount).to.eql(1);
+    });
 });

package/components/table/useChecked.ts

@@ -202,7 +202,7 @@ export function useChecked(
     instance.on('$change:data', updateAllCheckedStatus);
 
     instance.on('clickRow', (data: any, index: number, key: TableRowKey) => {
-        if (instance.get('rowCheckable')) {
+        if (instance.get('rowCheckable') && instance.get('checkType') !== 'none') {
             toggleChecked(key, index);
         }
     });

package/es/components/table/cell.js

@@ -20,6 +20,11 @@ export var TableCell = /*#__PURE__*/function (_Component) {
         isSame = false;
         break;
       }
+
+      if (key === 'props' && nextProps.props.$blocks) {
+        isSame = false;
+        break;
+      }
     }
 
     if (!isSame) {

package/es/components/table/index.spec.js

@@ -988,56 +988,80 @@ describe('Table', function () {
         }
       }
     }, _callee21);
-  }))); // it('should render dropdown in header of fixed table correctly in Vue', async () => {
-  // const Demo = {
-  // template: `
-  // <Table :data="data" style="width: 800px;">
-  // <TableColumn key="a" width="300" fixed="left" />
-  // <TableColumn key="b" width="300">
-  // <template slot="title">
-  // <Dropdown trigger="click" :container="dom => dom.parentElement.closest('.k-table')">
-  // <Icon class="ion-ios-arrow-down" style="margin-left: 100px;" />
-  // <DropdownMenu>
-  // <DropdownItem>1</DropdownItem>
-  // <DropdownItem>2</DropdownItem>
-  // <DropdownItem>3</DropdownItem>
-  // </DropdownMenu>
-  // </Dropdown>
-  // </template>
-  // </TableColumn>
-  // <TableColumn key="c" width="300" fixed="right" />
-  // </Table>
-  // `,
-  // components: {
-  // Table,
-  // TableColumn,
-  // Dropdown,
-  // DropdownMenu,
-  // DropdownItem,
-  // Icon,
-  // },
-  // data() {
-  // return {
-  // data: [
-  // {a: 1, b: 1, c: 1},
-  // {a: 2, b: 2, c: 2},
-  // ],
-  // };
-  // }
-  // };
-  // const container = document.createElement('div');
-  // document.body.appendChild(container);
-  // const app = new Vue({
-  // render: h => h('Demo'),
-  // components: {
-  // Demo
-  // }
-  // }).$mount(container);
-  // // should show the first dropdown menu
-  // app.$el.querySelector('.k-icon').click();
-  // const dropdownMenu = app.$el.querySelectorAll('.k-dropdown-menu')[0];
-  // expect(dropdownMenu.style.display).to.eql('');
-  // app.$destroy();
-  // document.body.removeChild(app.$el);
-  // });
+  })));
+  it('should update children in TableCell', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22() {
+    var update, Test, Demo, _mount24, instance, element;
+
+    return _regeneratorRuntime.wrap(function _callee22$(_context25) {
+      while (1) {
+        switch (_context25.prev = _context25.next) {
+          case 0:
+            update = sinon.spy();
+
+            Test = /*#__PURE__*/function (_Component3) {
+              _inheritsLoose(Test, _Component3);
+
+              function Test() {
+                return _Component3.apply(this, arguments) || this;
+              }
+
+              var _proto = Test.prototype;
+
+              _proto.beforeUpdate = function beforeUpdate() {
+                update();
+              };
+
+              return Test;
+            }(Component);
+
+            Test.template = "<div>test</div>";
+
+            Demo = /*#__PURE__*/function (_Component4) {
+              _inheritsLoose(Demo, _Component4);
+
+              function Demo() {
+                var _context24;
+
+                var _this3;
+
+                for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+                  args[_key3] = arguments[_key3];
+                }
+
+                _this3 = _Component4.call.apply(_Component4, _concatInstanceProperty(_context24 = [this]).call(_context24, args)) || this;
+                _this3.Table = Table;
+                _this3.TableColumn = TableColumn;
+                _this3.Test = Test;
+                return _this3;
+              }
+
+              Demo.defaults = function defaults() {
+                return {
+                  data: [{
+                    a: 1
+                  }, {
+                    a: 2
+                  }]
+                };
+              };
+
+              return Demo;
+            }(Component);
+
+            Demo.template = "\n                const {Table, TableColumn, Test} = this;\n                <Table data={this.get('data')} ref=\"table\">\n                    <TableColumn key=\"a\">\n                        <b:template>\n                            <Test />\n                        </b:template>\n                    </TableColumn>\n                </Table>\n            ";
+            _mount24 = mount(Demo), instance = _mount24[0], element = _mount24[1];
+            element.querySelector('tbody tr').click();
+            _context25.next = 9;
+            return wait();
+
+          case 9:
+            expect(update.callCount).to.eql(1);
+
+          case 10:
+          case "end":
+            return _context25.stop();
+        }
+      }
+    }, _callee22);
+  })));
 });

package/es/components/table/useChecked.js

@@ -211,7 +211,7 @@ export function useChecked(getEnableKeys, getAllKeys, isDisabledKey, getGrid, lo
 
   instance.on('$change:data', updateAllCheckedStatus);
   instance.on('clickRow', function (data, index, key) {
-    if (instance.get('rowCheckable')) {
+    if (instance.get('rowCheckable') && instance.get('checkType') !== 'none') {
       toggleChecked(key, index);
     }
   });

package/es/index.d.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v2.0.4
+ * @king-design v2.0.5
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -57,4 +57,4 @@ export * from './components/tree';
 export * from './components/treeSelect';
 export * from './components/upload';
 export * from './components/wave';
-export declare const version = "2.0.4";
+export declare const version = "2.0.5";

package/es/index.js

@@ -1,5 +1,5 @@
 /*!
- * @king-design v2.0.4
+ * @king-design v2.0.5
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -59,5 +59,5 @@ export * from './components/tree';
 export * from './components/treeSelect';
 export * from './components/upload';
 export * from './components/wave';
-export var version = '2.0.4';
+export var version = '2.0.5';
 /* generate end */

package/es/site/data/components/table/demos/basic/react.js

@@ -1,7 +1,7 @@
 import _inheritsLoose from "@babel/runtime-corejs3/helpers/inheritsLoose";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/concat";
 import React from 'react';
-import { Table, TableColumn } from '@king-design/react';
+import { Table, TableColumn, Select, Option } from '@king-design/react';
 
 var Demo = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(Demo, _React$Component);
@@ -36,7 +36,13 @@ var Demo = /*#__PURE__*/function (_React$Component) {
       resizable: true
     }, /*#__PURE__*/React.createElement(TableColumn, {
       key: "a",
-      title: "Title 1"
+      title: "Title 1",
+      slotTemplate: function slotTemplate(_ref) {
+        var data = _ref[0];
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Select, null, /*#__PURE__*/React.createElement(Option, {
+          value: "a"
+        }, "test")));
+      }
     }), /*#__PURE__*/React.createElement(TableColumn, {
       key: "b",
       title: "Title 2"

package/index.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v2.0.4
+ * @king-design v2.0.5
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -62,6 +62,6 @@ export * from './components/treeSelect';
 export * from './components/upload';
 export * from './components/wave';
 
-export const version = '2.0.4';
+export const version = '2.0.5';
 
 /* generate end */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@king-design/intact",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "A component library written in Intact for Intact, Vue, React and Angular",
   "main": "es/index.js",
   "scripts": {
@@ -30,7 +30,8 @@
     "prelease-patch": "lerna version prepatch --preid beta --force-publish && npm run _publish -- --tag=beta",
     "prelease-minor": "lerna version preminor --preid beta --force-publish && npm run _publish -- --tag=beta",
     "prelease-major": "lerna version premajor --preid beta --force-publish && npm run _publish -- --tag=beta",
-    "upload:resources": "gulp upload:resources"
+    "upload:resources": "gulp upload:resources",
+    "update:deps": "lerna exec -- yarn"
   },
   "repository": {
     "type": "git",
@@ -114,7 +115,7 @@
     "highlight.js": "^10.4.1",
     "history": "^5.0.0",
     "html-webpack-plugin": "5.3.1",
-    "intact-react": "^3.0.5",
+    "intact-react": "^3.0.6",
     "istanbul-instrumenter-loader": "^3.0.0",
     "js-yaml": "^4.1.0",
     "karma": "^6.3.2",
@@ -176,7 +177,7 @@
     "dayjs": "^1.10.7",
     "downloadjs": "^1.4.7",
     "enquire.js": "^2.1.6",
-    "intact": "^3.0.5",
+    "intact": "^3.0.6",
     "monaco-editor": "^0.26.1",
     "mxgraphx": "^4.0.7",
     "resize-observer-polyfill": "^1.5.1",