update: 1.12.0，升级tinper

tinper-acs · Mar 21, 2023 · b9995b2 · b9995b2
1 parent 8875e61
commit b9995b2
Show file tree

Hide file tree

Showing 20 changed files with 6,868 additions and 247,886 deletions.
diff --git a/build/index.js b/build/index.js
@@ -14,7 +14,7 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _tinperBee = require('tinper-bee');
+var _nextUi = require('@tinper/next-ui');
 
 var _FormControl = require('./FormControl.js');
 
@@ -24,10 +24,6 @@ var _modal = require('./modal.js');
 
 var _modal2 = _interopRequireDefault(_modal);
 
-var _beeForm = require('bee-form');
-
-var _beeForm2 = _interopRequireDefault(_beeForm);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
@@ -38,7 +34,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
-var FormItem = _beeForm2["default"].FormItem;
+var FormItem = _nextUi.Form.Item;
 
 var propTypes = {
   className: _propTypes2["default"].string,
@@ -69,7 +65,7 @@ var defaultProps = {
 var getContent = function getContent(localeList) {
   return Object.keys(localeList).map(function (localeKey) {
     return _react2["default"].createElement(
-      _tinperBee.Row,
+      _nextUi.Row,
       { key: 'preview' + localeKey, className: 'input-locale-text' },
       _react2["default"].createElement(
         'div',
@@ -243,7 +239,7 @@ var AcInputLocale = function (_Component) {
         localeValue || defaultValue
       ),
       this.props.showIcon ? _react2["default"].createElement(
-        _tinperBee.Popover,
+        _nextUi.Popover,
         {
           placement: 'right',
           content: getContent(localeList),
@@ -259,23 +255,19 @@ var AcInputLocale = function (_Component) {
     var _this2 = this;
 
     return Object.keys(localeList).map(function (localeKey) {
+      var label = _react2["default"].createElement(
+        _react2["default"].Fragment,
+        null,
+        _this2.isShowNoneLeftLable ? _this2.renderLabelLeft(localeKey) : null,
+        localeList[localeKey].label,
+        _this2.renderLabelright(localeKey)
+      );
       return _react2["default"].createElement(
         'div',
         { className: 'edit-panel edit-panel-all', key: localeKey },
         _react2["default"].createElement(
           FormItem,
-          null,
-          _react2["default"].createElement(
-            'div',
-            { className: 'u-form-item-label' },
-            _react2["default"].createElement(
-              _tinperBee.Label,
-              { title: localeList[localeKey].label },
-              _this2.isShowNoneLeftLable ? _this2.renderLabelLeft(localeKey) : null,
-              localeList[localeKey].label,
-              _this2.renderLabelright(localeKey)
-            )
-          ),
+          { label: label },
           _react2["default"].createElement(
             'div',
             { style: { 'display': 'inline-block', 'width': 'calc(100% - 130px)' } },
@@ -300,23 +292,19 @@ var AcInputLocale = function (_Component) {
     var _this3 = this;
 
     return Object.keys(localeList).map(function (localeKey) {
+      var label = _react2["default"].createElement(
+        _react2["default"].Fragment,
+        null,
+        _this3.isShowNoneLeftLable ? _this3.renderLabelLeft(localeKey) : null,
+        localeList[localeKey].label,
+        _this3.renderLabelright(localeKey)
+      );
       return _react2["default"].createElement(
         'div',
         { className: 'edit-panel edit-panel-all', key: localeKey },
         _react2["default"].createElement(
           FormItem,
-          null,
-          _react2["default"].createElement(
-            'div',
-            { className: 'u-form-item-label' },
-            _react2["default"].createElement(
-              _tinperBee.Label,
-              { title: localeList[localeKey].label },
-              _this3.isShowNoneLeftLable ? _this3.renderLabelLeft(localeKey) : null,
-              localeList[localeKey].label,
-              _this3.renderLabelright(localeKey)
-            )
-          ),
+          { label: label },
           _react2["default"].createElement(
             'div',
             { style: { 'display': 'inline-block', 'width': 'calc(100% - 130px)' } },
@@ -442,7 +430,7 @@ var AcInputLocale = function (_Component) {
               }
             })),
             _react2["default"].createElement(
-              _tinperBee.Popconfirm,
+              _nextUi.Popconfirm,
               {
                 onClick: disabled ? function () {} : this.open,
                 trigger: 'click',
@@ -562,7 +550,7 @@ var AcInputLocale = function (_Component) {
               }
             })),
             _react2["default"].createElement(
-              _tinperBee.Popconfirm,
+              _nextUi.Popconfirm,
               {
                 trigger: 'click',
                 rootClose: true,

diff --git a/build/modal.js b/build/modal.js
@@ -12,7 +12,7 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _tinperBee = require('tinper-bee');
+var _nextUi = require('@tinper/next-ui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -106,7 +106,7 @@ var ModalWrap = function (_Component) {
         close = _state.close;
 
     return _react2["default"].createElement(
-      _tinperBee.Modal,
+      _nextUi.Modal,
       {
         show: showModal,
         width: '600',
@@ -116,29 +116,29 @@ var ModalWrap = function (_Component) {
         enforceFocus: false
       },
       _react2["default"].createElement(
-        _tinperBee.Modal.Header,
+        _nextUi.Modal.Header,
         { closeButton: true },
         _react2["default"].createElement(
-          _tinperBee.Modal.Title,
+          _nextUi.Modal.Title,
           { className: 'modal-title' },
           title
         )
       ),
       _react2["default"].createElement(
-        _tinperBee.Modal.Body,
+        _nextUi.Modal.Body,
         null,
         this.props.children
       ),
       _react2["default"].createElement(
-        _tinperBee.Modal.Footer,
+        _nextUi.Modal.Footer,
         null,
         _react2["default"].createElement(
-          _tinperBee.Button,
+          _nextUi.Button,
           { bordered: true, className: 'cancel-qx', onClick: onCancel },
           cancelName
         ),
         _react2["default"].createElement(
-          _tinperBee.Button,
+          _nextUi.Button,
           { colors: 'primary', onClick: onOk },
           okName
         )

diff --git a/demo/InputLocaleDemo.scss b/demo/InputLocaleDemo.scss
@@ -3,11 +3,10 @@
 .demoPadding{
     padding: 10px;
     width: 300px;
-    .u-button{
-      width: 100px;
+    .wui-button{
+      height: 36px;
       margin-right: 10px;
       line-height: 36px;
-      height: 36px;
       padding: 0;
     }
 }
@@ -18,6 +17,7 @@
 
 .btn{
     display: flex;
+    grid-column-gap: 10px;
     margin: 10px;
     margin-bottom: 30px;
 }

diff --git a/demo/demolist/Demo1.js b/demo/demolist/Demo1.js
@@ -7,7 +7,7 @@
 
 import React, { Component } from 'react';
 import AcInputLocale from '../../src/index.js';
-import Button from 'bee-button';
+import {Button} from '@tinper/next-ui';
 
  class Demo1 extends Component {
     constructor(props){

diff --git a/demo/demolist/Demo2.js b/demo/demolist/Demo2.js
@@ -8,7 +8,7 @@
 
 import React, { Component } from 'react';
 import AcInputLocale from '../../src/index.js';
-import Button from 'bee-button';
+import {Button} from '@tinper/next-ui';
 
  class Demo2 extends Component {
 

diff --git a/demo/demolist/Demo3.js b/demo/demolist/Demo3.js
@@ -8,7 +8,7 @@
 
 import React, { Component } from 'react';
 import AcInputLocale from '../../src/index.js';
-import Button from 'bee-button';
+import {Button} from '@tinper/next-ui';
 
  class Demo3 extends Component {
 

diff --git a/demo/demolist/Demo4.js b/demo/demolist/Demo4.js
@@ -8,7 +8,7 @@
 
 import React, { Component } from 'react';
 import AcInputLocale from '../../src/index.js';
-import Button from 'bee-button';
+import {Button} from '@tinper/next-ui';
 
  class Demo4 extends Component {
 

diff --git a/demo/demolist/Demo5.js b/demo/demolist/Demo5.js
@@ -8,8 +8,8 @@
 
 import React, { Component } from 'react';
 import AcInputLocale from '../../src/index.js';
-import Button from 'bee-button';
-import Form from 'bee-form';
+import {Button, Form} from '@tinper/next-ui';
+
  class Demo5 extends Component {
 
     constructor(props){

diff --git a/demo/demolist/Demo6.js b/demo/demolist/Demo6.js
@@ -7,8 +7,8 @@
  */
 import React, { Component } from 'react';
 import AcInputLocale from '../../src/index.js';
-import Button from 'bee-button';
-import Form from 'bee-form';
+import {Button, Form} from '@tinper/next-ui';
+
 class Demo6 extends Component {
     constructor(props){
         super(props)

diff --git a/demo/index-demo-base.js b/demo/index-demo-base.js
@@ -1,10 +1,8 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import { Con, Row, Col } from 'bee-layout';
-import { Panel } from 'bee-panel';
-import Drawer from 'bee-drawer';
-import Clipboard from 'bee-clipboard'; 
+import { Row, Col, Collapse, Drawer, Clipboard } from '@tinper/next-ui';
 
+const {Panel} = Collapse
 
 
 {demolist}

diff --git a/demo/index.js b/demo/index.js