shineout 3.8.1-beta.3 → 3.8.1-beta.5

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.8.1-beta.3'
+  version: '3.8.1-beta.5'
 };

package/dist/shineout.js

@@ -12386,7 +12386,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.8.1-beta.3');
+/* harmony default export */ var version = ('3.8.1-beta.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -27095,7 +27095,7 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
     }
   },
   rowExpand: {
-    '&& td': {
+    '&& > td': {
       background: src.tableExpandBackgroundColor
     }
   },
@@ -42913,15 +42913,14 @@ var Cascader = function Cascader(props0) {
     });
   };
   var renderEmpty = function renderEmpty() {
-    if (emptyText) {
-      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: styles === null || styles === void 0 ? void 0 : styles.empty,
-        children: emptyText
+    if (renderOptionList) {
+      return renderOptionList(null, {
+        loading: !!loading
       });
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: styles === null || styles === void 0 ? void 0 : styles.empty,
-      children: getLocale(locale, 'noData')
+      children: emptyText || getLocale(locale, 'noData')
     });
   };
   var renderNormalList = function renderNormalList() {
@@ -42984,7 +42983,6 @@ var Cascader = function Cascader(props0) {
       return renderLoading();
     }
     if (isDataEmpty) {
-      // todo: 空数据时 是否 支持一下也能走到renderOptionList
       return renderEmpty();
     }
     if (!filterText || filterText && mode !== undefined || data && data.length === 0) {
@@ -51082,7 +51080,8 @@ function use_previous_usePrevious(value) {
 
 
 
-var form_schema_builder_excluded = ["required"];
+var form_schema_builder_excluded = ["required"],
+  form_schema_builder_excluded2 = ["required"];
 var SchemaBuilder = /*#__PURE__*/function () {
   function SchemaBuilder(formName) {
     classCallCheck_default()(this, SchemaBuilder);
@@ -51303,7 +51302,9 @@ var SchemaBuilder = /*#__PURE__*/function () {
                 type: 'string'
               };
             } else {
-              fieldSchemaInfo.type = typeof_default()(componentElement.props.value);
+              if (typeof componentElement.props.value !== 'undefined') {
+                fieldSchemaInfo.type = typeof_default()(componentElement.props.value);
+              }
             }
             break;
         }
@@ -51379,7 +51380,11 @@ var SchemaBuilder = /*#__PURE__*/function () {
           properties: {}
         };
       }
-      this.mergeSchema(currentSchema.items, remainingSegments, meta);
+
+      // 过滤掉 required 属性，items 对象不应该包含 required
+      var required = meta.required,
+        itemsMeta = objectWithoutProperties_default()(meta, form_schema_builder_excluded);
+      this.mergeSchema(currentSchema.items, remainingSegments, itemsMeta);
     }
   }, {
     key: "handleObjectProperty",
@@ -51398,7 +51403,7 @@ var SchemaBuilder = /*#__PURE__*/function () {
       if (remainingSegments.length === 0) {
         // 叶子节点，应用元数据并处理 required
         var required = meta.required,
-          restMeta = objectWithoutProperties_default()(meta, form_schema_builder_excluded);
+          restMeta = objectWithoutProperties_default()(meta, form_schema_builder_excluded2);
         Object.assign(currentSchema.properties[propertyName], restMeta);
         if (typeof required === 'boolean') {
           this.handleRequired(currentSchema, propertyName, required);
@@ -73035,7 +73040,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.1-beta.3'
+  version: '3.8.1-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;