@teamias/rex-design 0.0.18 → 0.0.20

package/dist/components/base-descriptions/base-descriptions.d.ts

@@ -0,0 +1,28 @@
+import { Descriptions, GetProps } from 'antd';
+import { FC } from 'react';
+import { DataCell } from '../data-cell';
+export declare const BaseDescriptions: FC<IBaseDescriptionsProps>;
+type TDataCellItem = GetProps<typeof DataCell>['items'][number];
+/** 允许自定义参数 */
+type TDataCellItemExtend = TDataCellItem & Record<string, any>;
+export interface IBaseDescriptionsProps extends Omit<GetProps<typeof Descriptions>, 'items'> {
+    /** 主要渲染数据 */
+    items?: Array<{
+        label: React.ReactNode;
+        span?: number;
+        children?: React.ReactNode | Array<TDataCellItemExtend[]>;
+    }>;
+    /**
+     * - 使用 DataCell 组件渲染单元格, 需要注意数据结构
+     * - 默认 true
+     */
+    useDataCellRender?: boolean;
+    /** dataCell 的点击事件 */
+    onDataCellClick?: (data: {
+        item: TDataCellItemExtend[];
+        cellItem: TDataCellItemExtend;
+        subItem: TDataCellItemExtend[number];
+        index: number;
+    }) => void;
+}
+export {};

package/dist/components/base-descriptions/base-descriptions.js

@@ -0,0 +1,58 @@
+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 = ["items", "useDataCellRender", "onDataCellClick"];
+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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { Descriptions } from 'antd';
+import { DataCell } from "../data-cell";
+import { jsx as _jsx } from "react/jsx-runtime";
+export var BaseDescriptions = function BaseDescriptions(_ref) {
+  var items = _ref.items,
+    _ref$useDataCellRende = _ref.useDataCellRender,
+    useDataCellRender = _ref$useDataCellRende === void 0 ? true : _ref$useDataCellRende,
+    onDataCellClick = _ref.onDataCellClick,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/_jsx(Descriptions, _objectSpread(_objectSpread({
+    size: "small"
+  }, otherProps), {}, {
+    items: items === null || items === void 0 ? void 0 : items.map(function (item, index) {
+      try {
+        var children = useDataCellRender ? item.children.map(function (topItem, topIndex) {
+          return /*#__PURE__*/_jsx(DataCell, {
+            items: topItem,
+            onClick: function onClick(cellItem, subItem) {
+              // console.log(cellItem, subItem);
+              onDataCellClick === null || onDataCellClick === void 0 || onDataCellClick({
+                item: topItem,
+                cellItem: cellItem,
+                subItem: subItem,
+                index: index
+              });
+            }
+          }, topIndex);
+        }) : item.children || '';
+        return _objectSpread(_objectSpread({}, item), {}, {
+          key: "".concat(index),
+          children: children
+        });
+      } catch (error) {
+        console.error('BaseDescriptions Error:', error, item, index);
+        return _objectSpread(_objectSpread({}, item), {}, {
+          key: "".concat(index),
+          children: /*#__PURE__*/_jsx("div", {
+            style: {
+              color: 'red'
+            },
+            children: "\u6570\u636E\u51FA\u73B0\u95EE\u9898,\u8BF7\u67E5\u770B\u63A7\u5236\u53F0\u8F93\u51FA"
+          })
+        });
+      }
+    })
+  }));
+};
+
+/** 允许自定义参数 */

package/dist/components/base-descriptions/demo/Basic.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/components/base-descriptions/demo/Basic.js

@@ -0,0 +1,25 @@
+import { BaseDescriptions } from "../base-descriptions";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsx(BaseDescriptions, {
+    bordered: true,
+    useDataCellRender: false,
+    items: [{
+      label: 'UserName',
+      children: 'Zhou Maomao'
+    }, {
+      label: 'Telephone',
+      children: '1810000000'
+    }, {
+      label: 'Live',
+      children: 'Hangzhou, Zhejiang'
+    }, {
+      label: 'Address',
+      span: 2,
+      children: 'No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China'
+    }, {
+      label: 'Remark',
+      children: 'empty'
+    }]
+  });
+});

package/dist/components/base-descriptions/demo/BasicDataCell.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/components/base-descriptions/demo/BasicDataCell.js

@@ -0,0 +1,121 @@
+import { BaseDescriptions } from "../base-descriptions";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsx(BaseDescriptions, {
+    bordered: true,
+    items: [{
+      label: 'Address',
+      span: 2,
+      children: [[{
+        type: 'group-v2',
+        props: {
+          label: 'label',
+          // labelStyle: {},
+          // itemsGap: 2,
+          // itemsStyle: {},
+          // itemsSeparator: '/',
+          // itemsDirection: 'row',
+          items: [{
+            type: 'text',
+            value: 'qweqweqweqwe',
+            action: 'url',
+            url: 'http://baidu.com'
+          }, {
+            type: 'icon',
+            iconsType: 'iconify',
+            name: 'svg-spinners:ring-resize',
+            size: 12,
+            action: 'url',
+            url: 'http://baidu.com'
+          }, {
+            type: 'text',
+            value: 'qweqweqweqwe',
+            copyable: true,
+            tooltip: true,
+            style: {
+              color: 'red'
+            }
+          }, {
+            type: 'tag',
+            value: '33123',
+            color: 'red'
+          }, {
+            type: 'img',
+            src: 'http://qweqe'
+          }]
+        }
+      }, {
+        type: 'group-v2',
+        props: {
+          items: [{
+            type: 'img',
+            src: 'http://qweqe'
+          }, {
+            type: 'group-v2',
+            props: {
+              itemsDirection: 'column',
+              items: [{
+                type: 'text',
+                value: 'qweqweqweqwe',
+                action: 'url',
+                url: 'http://baidu.com',
+                ellipsis: 1,
+                copyable: true
+              }, {
+                type: 'text',
+                value: 'qweqweqweqwe2',
+                ellipsis: 1,
+                copyable: '自定义复制'
+              }, {
+                type: 'text',
+                value: 'qweqweqweqwe3',
+                tooltip: '自定义提示'
+              }]
+            }
+          }]
+        }
+      }, {
+        type: 'group-v2',
+        props: {
+          items: [{
+            type: 'img',
+            src: 'http://qweqe'
+          }, {
+            type: 'group-v2',
+            props: {
+              itemsDirection: 'column',
+              items: [{
+                type: 'group-v2',
+                props: {
+                  itemsDirection: 'column',
+                  label: 'label',
+                  items: [{
+                    type: 'text',
+                    value: 'qweqweqweqwe'
+                  }]
+                }
+              }, {
+                type: 'group-v2',
+                props: {
+                  itemsDirection: 'column',
+                  label: 'label',
+                  items: [{
+                    type: 'text',
+                    value: 'qweqweqweqwe2',
+                    action: 'custom'
+                  }]
+                }
+              }]
+            }
+          }]
+        }
+      }]]
+    }, {
+      label: 'Remark',
+      children: 'empty'
+    }],
+    onDataCellClick: function onDataCellClick(data) {
+      console.log(data);
+    }
+  });
+});

package/dist/components/base-descriptions/index.d.ts

@@ -0,0 +1 @@
+export * from './base-descriptions';

package/dist/components/base-descriptions/index.js

@@ -0,0 +1 @@
+export * from "./base-descriptions";

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

@@ -101,15 +101,13 @@ export var BaseForm = function BaseForm(props) {
         return /*#__PURE__*/_jsx(ProFormDependency, {
           name: allFields,
           children: function children(data, form) {
-            var _config$item;
             // 依赖规则可能有多条，且可能作用于同一类型（如多个 hidden、disabled 等），这里需要全部规则都满足才生效
-            var _ref2 = [],
-              hidden = _ref2[0],
-              disabled = _ref2[1],
-              clear = _ref2[2],
-              updateData = _ref2[3],
-              show = _ref2[4],
-              syncValue = _ref2[5];
+            var hidden = [],
+              disabled = [],
+              clear = [],
+              updateData = [],
+              show = [],
+              syncValue = [];
 
             /** 条件判断 */
             var judge = function judge(inlineItem) {
@@ -137,23 +135,48 @@ export var BaseForm = function BaseForm(props) {
               var _dependItem$isTouched;
               switch (dependItem.action) {
                 case 'hidden':
-                  // 多条 hidden 规则，只有全部为 true 时才隐藏（即“与”关系）
-                  if (typeof hidden === 'undefined' || hidden) hidden = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  hidden.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof hidden === 'undefined' || hidden)
+                  //   hidden =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'show':
-                  if (typeof show === 'undefined' || show) show = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  show.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof show === 'undefined' || show)
+                  //   show =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'disabled':
-                  if (typeof disabled === 'undefined' || disabled) disabled = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  disabled.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof disabled === 'undefined' || disabled)
+                  //   disabled =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'clear':
-                  if (typeof clear === 'undefined' || clear) clear = isTouchedFn(dependItem.field, (_dependItem$isTouched = dependItem.isTouched) !== null && _dependItem$isTouched !== void 0 ? _dependItem$isTouched : true) && judge(dependItem);
+                  clear.push(isTouchedFn(dependItem.field, (_dependItem$isTouched = dependItem.isTouched) !== null && _dependItem$isTouched !== void 0 ? _dependItem$isTouched : true) && judge(dependItem));
+                  // if (typeof clear === 'undefined' || clear)
+                  //   clear =
+                  //     isTouchedFn(
+                  //       dependItem.field,
+                  //       dependItem.isTouched ?? true,
+                  //     ) && judge(dependItem);
                   break;
                 case 'updateData':
-                  if (typeof updateData === 'undefined' || updateData) updateData = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  updateData.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof updateData === 'undefined' || updateData)
+                  //   updateData =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'syncValue':
-                  if (typeof syncValue === 'undefined' || syncValue) syncValue = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  syncValue.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof syncValue === 'undefined' || syncValue)
+                  //   syncValue =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 default:
                   console.error('Wrong dependenciesV2 action configure');
@@ -161,19 +184,38 @@ export var BaseForm = function BaseForm(props) {
               }
             });
 
-            // 处理冲突：hidden 优先级最高，满足则直接 return null，不渲染
-            if (hidden) return null;
-            // show 存在时，只有全部 show 规则都为 true 才显示，否则 return null
-            if (typeof show === 'boolean' && !show) return null;
+            // hidden: 满足一条 hidden 规则则隐藏
+            if (hidden.some(function (ii) {
+              return ii;
+            })) return null;
+            // show: 满足一条 show 规则则显示
+            if (show.length && !show.some(function (ii) {
+              return ii;
+            })) return null;
 
             // 实时修改 fieldProps，disabled 联动
-            var fieldProps = ((_config$item = config.item) === null || _config$item === void 0 ? void 0 : _config$item.fieldProps) || {};
-            config.item.fieldProps = _objectSpread(_objectSpread({}, fieldProps), {}, {
-              disabled: disabled
-            });
+            if (disabled.length) {
+              if (disabled.some(function (ii) {
+                return ii;
+              })) {
+                var _config$item;
+                var fieldProps = ((_config$item = config.item) === null || _config$item === void 0 ? void 0 : _config$item.fieldProps) || {};
+                config.item.fieldProps = _objectSpread(_objectSpread({}, fieldProps), {}, {
+                  disabled: true
+                });
+              } else {
+                var _config$item2;
+                var _fieldProps = ((_config$item2 = config.item) === null || _config$item2 === void 0 ? void 0 : _config$item2.fieldProps) || {};
+                config.item.fieldProps = _objectSpread(_objectSpread({}, _fieldProps), {}, {
+                  disabled: false
+                });
+              }
+            }
 
-            // clear 联动，满足全部 clear 规则时清空当前字段
-            if (clear) {
+            // clear: 满足一条 clear 规则则清除
+            if (clear.some(function (ii) {
+              return ii;
+            })) {
               setTimeout(function () {
                 form.setFields([{
                   name: keyStr,
@@ -184,11 +226,15 @@ export var BaseForm = function BaseForm(props) {
               });
             }
 
-            // updateData 联动，满足全部 updateData 规则时缓存依赖数据
-            dependenciesSearchCacheData[keyStr] = updateData ? data : undefined;
+            // updateData: 满足一条 updateData 规则则缓存依赖数据
+            dependenciesSearchCacheData[keyStr] = updateData.some(function (ii) {
+              return ii;
+            }) ? data : undefined;
 
-            // syncValue 联动，满足全部 syncValue 规则时同步指定字段的值
-            if (syncValue) {
+            // syncValue: 满足一条 syncValue 规则则同步指定字段的值
+            if (syncValue.some(function (ii) {
+              return ii;
+            })) {
               // 只取第一个 syncValue 规则对应的字段
               var key = item.dependenciesV2.find(function (ii) {
                 return ii.action === 'syncValue';
@@ -224,8 +270,8 @@ export var BaseForm = function BaseForm(props) {
               return values[field] !== undefined && values[field] !== false && values[field].length !== 0;
             });
             if ((disabledFields === null || disabledFields === void 0 ? void 0 : disabledFields.length) > 0 && shouldDisabled) {
-              var _config$item2;
-              var fieldProps = ((_config$item2 = config.item) === null || _config$item2 === void 0 ? void 0 : _config$item2.fieldProps) || {};
+              var _config$item3;
+              var fieldProps = ((_config$item3 = config.item) === null || _config$item3 === void 0 ? void 0 : _config$item3.fieldProps) || {};
               config.item.fieldProps = _objectSpread(_objectSpread({}, fieldProps), {}, {
                 disabled: true
               });

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

@@ -66,11 +66,6 @@ var s2 = function s2(params) {
 };
 export default (function () {
   var fields = [{
-    valueType: 'dateRange',
-    field: ['dateRange-start', 'dateRange-end'],
-    label: 'dateRange',
-    defaultValue: -6
-  }, {
     valueType: 'selectDim',
     field: 'selectDim',
     label: 'selectDim',
@@ -80,18 +75,16 @@ export default (function () {
   }, {
     valueType: 'select',
     field: 'select',
-    label: 'select(updateData)',
+    label: '1.selectDim 改变后更新接口数据 (updateData)',
     api: '/selectData',
     dependenciesV2: [{
       field: 'selectDim',
-      action: 'updateData',
-      op: 'eq',
-      target: '2'
+      action: 'updateData'
     }]
   }, {
     valueType: 'input',
     field: 'input111',
-    label: 'input (selectDim === 2 显示)',
+    label: '2.selectDim === 2 显示',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'show',
@@ -101,7 +94,7 @@ export default (function () {
   }, {
     valueType: 'input',
     field: 'input222',
-    label: 'input (selectDim 为空时隐藏)',
+    label: '3.selectDim 为空时隐藏',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'hidden',
@@ -110,15 +103,18 @@ export default (function () {
   }, {
     valueType: 'input',
     field: 'input333',
-    label: 'input (selectDim 改变时,清空值)',
+    label: '4.(selectDim 和 1.) 改变时,清空值',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'clear'
+    }, {
+      field: 'select',
+      action: 'clear'
     }]
   }, {
     valueType: 'input',
     field: 'input444',
-    label: 'input (selectDim 改变时同步赋值)',
+    label: '5.selectDim 改变时同步赋值',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'syncValue'
@@ -126,7 +122,7 @@ export default (function () {
   }, {
     valueType: 'input',
     field: 'input555',
-    label: 'input (selectDim 非空disabled)',
+    label: '6.selectDim 非空 disabled',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'disabled',
@@ -135,28 +131,6 @@ export default (function () {
       field: 'selectDim',
       action: 'syncValue'
     }]
-  }, {
-    label: '订单类型',
-    field: 'order_type',
-    valueType: 'select',
-    multiple: false,
-    api: '/selectData',
-    defaultParams: {
-      type: 1
-    }
-  }, {
-    label: '状态',
-    field: 'status',
-    valueType: 'select',
-    multiple: false,
-    api: '/selectData',
-    dependenciesV2: [{
-      field: 'order_type',
-      action: 'updateData'
-    }]
-    // "defaultParams": {
-    //   "order_type": 2
-    // }
   }];
   var initialValues = getFieldsDefaultValues(fields);
   // console.log(initialValues);

package/dist/components/index.d.ts

@@ -1,4 +1,5 @@
 export * from './action-buttons';
+export * from './base-descriptions';
 export * from './base-form';
 export * from './base-list-table';
 export * from './base-table';

package/dist/components/index.js

@@ -1,4 +1,5 @@
 export * from "./action-buttons";
+export * from "./base-descriptions";
 export * from "./base-form";
 export * from "./base-list-table";
 export * from "./base-table";

package/package.json

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