@teamias/rex-design 0.0.29 → 0.0.31

package/dist/components/base-form/core/descriptions-model.js

@@ -1,6 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["descriptionsProps", "fields"],
-  _excluded2 = ["label", "tooltip", "formItemProps"];
+  _excluded2 = ["label", "tooltip", "formItemProps", "rules"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -37,9 +37,10 @@ export var DescriptionsModel = function DescriptionsModel(_ref) {
       var label = field.label,
         tooltip = field.tooltip,
         formItemProps = field.formItemProps,
+        rules = field.rules,
         otherData = _objectWithoutProperties(field, _excluded2);
       return {
-        label: /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+        label: /*#__PURE__*/_jsx(Form.Item, {
           label: label,
           tooltip: tooltip,
           required: isRequired,
@@ -47,7 +48,8 @@ export var DescriptionsModel = function DescriptionsModel(_ref) {
           style: {
             margin: 0
           }
-        }, formItemProps), {}, {
+          // {...formItemProps}
+          ,
           labelCol: _objectSpread(_objectSpread({}, formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.labelCol), {}, {
             style: _objectSpread({
               padding: 0,
@@ -60,13 +62,12 @@ export var DescriptionsModel = function DescriptionsModel(_ref) {
               display: 'none'
             }
           }
-        })),
+        }),
         children: /*#__PURE__*/_jsx(BaseForm, _objectSpread(_objectSpread({}, baseFormProps), {}, {
           itemMarginBottom: 0,
           fields: [_objectSpread(_objectSpread({}, otherData), {}, {
-            formItemProps: {
-              wrapperCol: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.wrapperCol
-            }
+            rules: rules,
+            formItemProps: formItemProps
           })]
         })),
         span: field.span || 1
@@ -77,7 +78,9 @@ export var DescriptionsModel = function DescriptionsModel(_ref) {
     children: /*#__PURE__*/_jsx(Descriptions, _objectSpread(_objectSpread({
       bordered: true,
       styles: {
-        label: {}
+        content: {
+          padding: '24px 12px'
+        }
       }
     }, descriptionsProps), {}, {
       items: descriptionsItems

package/dist/components/base-form/demo/BaseFormCustomFormItem.js

@@ -49,7 +49,7 @@ export default (function () {
             // console.log(props);
 
             return /*#__PURE__*/_jsx(_Fragment, {
-              children: /*#__PURE__*/_jsx(Input, {
+              children: /*#__PURE__*/_jsx(Input.Password, {
                 value: props.value,
                 onChange: props.onChange
               })

package/dist/components/base-form/style/index.js

@@ -8,4 +8,4 @@ export var BaseFormStyle = createGlobalStyle([".base-form-field-group{display:fl
 export var DescriptionsStyle = styled.div.withConfig({
   displayName: "DescriptionsStyle",
   componentId: "rex-design-aaf4__sc-1e1tacy-0"
-})([".ant-form-item-additional{position:absolute;}"]);
+})([".ant-descriptions-view{overflow:auto;}.ant-form-item-additional{position:absolute;}"]);

package/dist/components/tiptap-editor/demo/index.js

@@ -29,10 +29,10 @@ export default (function () {
         messages: _objectSpread({}, crush(enUS))
       })
     },
-    children: /*#__PURE__*/_jsx(TiptapEditor, {
-      readOnly: true
-      //  defaultValue={value}
-      ,
+    children: /*#__PURE__*/_jsx(TiptapEditor
+    // readOnly={true}
+    //  defaultValue={value}
+    , {
       value: value,
       onChange: function onChange(e) {
         console.log(e);

package/dist/hooks/use-state-data/use-state-data.js

@@ -6,16 +6,26 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useEffect, useRef, useState } from 'react';
 var withResolvers = function withResolvers() {
+  var isPending = {
+    value: true
+  };
   var resolve = function resolve() {};
   var reject = function reject() {};
   var promise = new Promise(function (rel, rej) {
-    resolve = rel;
-    reject = rej;
+    resolve = function resolve() {
+      isPending.value = false;
+      rel();
+    };
+    reject = function reject() {
+      isPending.value = false;
+      rej();
+    };
   });
   return {
     promise: promise,
     resolve: resolve,
-    reject: reject
+    reject: reject,
+    isPending: isPending
   };
 };
 
@@ -33,11 +43,17 @@ export var useStateData = function useStateData(stateFn) {
     _useState4 = _slicedToArray(_useState3, 1),
     state = _useState4[0];
   var _useRef = useRef({
+      /** 销毁锁 */
       lock: false,
       promiseContent: withResolvers(),
       // nextTick: (fn: () => void) => {},
       newUpdateFn: function newUpdateFn() {
         if (!data.lock) update({});
+
+        // 替换前,把之前的 pending 解决掉,不然会造成死锁
+        if (data.promiseContent.isPending.value) {
+          data.promiseContent.resolve();
+        }
         data.promiseContent = withResolvers();
         return data.promiseContent.promise;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",