@teamias/rex-design 0.1.2 → 0.1.4

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

@@ -38,7 +38,7 @@ export var Core = function Core(props) {
     dependenciesSearchCacheData = _useRef2.current;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(BaseFormStyle, {}), outFields === null || outFields === void 0 ? void 0 : outFields.map(function (item, index) {
-      var _item$field;
+      var _item$field, _config$item$initialV, _config$item$params;
       var fields = Array.isArray(item.field) ? item.field : [(_item$field = item.field) !== null && _item$field !== void 0 ? _item$field : "custom-dynamic-".concat(index)];
       var keyStr = fields.join('-');
       var itemProps = outFieldProps === null || outFieldProps === void 0 ? void 0 : outFieldProps[fields.join('-')];
@@ -86,6 +86,12 @@ export var Core = function Core(props) {
         rawAllProps: rawAllProps,
         formatMessage: formatMessage
       });
+
+      // 统一字段
+      config.item.initialValue = (_config$item$initialV = config.item.initialValue) !== null && _config$item$initialV !== void 0 ? _config$item$initialV : config.item.defaultValue;
+      delete config.item.defaultValue;
+      config.item.params = (_config$item$params = config.item.params) !== null && _config$item$params !== void 0 ? _config$item$params : config.item.defaultParams;
+      delete config.item.defaultParams;
       if (mergeItem.hidden) return;
       if (operationPermission && !operationPermission(mergeItem.permissionKey)) return;
 

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

@@ -21,7 +21,7 @@ export default (function () {
     subItems: [{
       valueType: 'select',
       field: 'avg_cost',
-      defaultValue: 'avg_cost',
+      initialValue: 'avg_cost',
       // "itemWidth": "150px",
       fieldProps: {
         allowClear: false,
@@ -48,7 +48,7 @@ export default (function () {
       field: 'multipleComponents-input',
       labelWidth: '100px',
       // itemWidth: '20%',
-      defaultValue: '2025-05-05',
+      initialValue: '2025-05-05',
       formItemProps: {
         style: {
           background: '#000',
@@ -63,7 +63,7 @@ export default (function () {
       valueType: 'treeSelect',
       field: 'multipleComponents-treeSelect',
       // itemWidth: '80%',
-      defaultValue: 'light',
+      initialValue: 'light',
       options: [{
         label: 'Light',
         value: 'light'
@@ -74,7 +74,7 @@ export default (function () {
     }, {
       valueType: 'datePicker',
       field: 'multipleComponents-datePicker',
-      defaultValue: '2025-05-05'
+      initialValue: '2025-05-05'
     }, {
       valueType: 'treeSelect',
       field: 'multipleComponents-treeSelect2',
@@ -92,12 +92,12 @@ export default (function () {
     // {
     //   valueType: 'inputNumberRangeV2',
     //   field: ['multipleComponents-min', 'multipleComponents-max'],
-    //   defaultValue: [2, 5],
+    //   initialValue: [2, 5],
     // },
     // {
     //   valueType: 'select',
     //   field: 'multipleComponents-select',
-    //   defaultValue: 'light',
+    //   initialValue: 'light',
     //   options: [
     //     {label: 'Light', value: 'light'},
     //     {label: 'Light2', value: 'light2'},
@@ -112,13 +112,13 @@ export default (function () {
     valueType: 'input',
     field: 'input',
     label: 'input',
-    defaultValue: 'input',
+    initialValue: 'input',
     hidden: false
   }, {
     valueType: 'select',
     field: 'select',
     label: 'select',
-    defaultValue: 'light',
+    initialValue: 'light',
     options: [{
       label: 'Light',
       value: 'light'
@@ -131,7 +131,7 @@ export default (function () {
     field: 'selectDim',
     label: 'selectDim',
     api: '/selectData',
-    defaultParams: {
+    params: {
       a: 1,
       b: 2
     }
@@ -139,7 +139,7 @@ export default (function () {
     valueType: 'dateRangeV2',
     field: ['dateRangeV2-start', 'dateRangeV2-end'],
     label: 'dateRangeV2',
-    defaultValue: -29,
+    initialValue: -29,
     required: true,
     fieldProps: {
       showTime: true,
@@ -174,7 +174,7 @@ export default (function () {
     valueType: 'checkbox',
     field: 'checkbox',
     label: 'checkbox',
-    defaultValue: true
+    initialValue: true
   }, {
     valueType: 'checkboxGroup',
     field: 'checkboxGroup',
@@ -190,7 +190,7 @@ export default (function () {
     valueType: 'radioGroup',
     field: 'radioGroup',
     label: 'radioGroup',
-    defaultValue: 'light',
+    initialValue: 'light',
     options: [{
       label: 'Light',
       value: 'light'
@@ -202,17 +202,17 @@ export default (function () {
     valueType: 'inputNumber',
     field: 'inputNumber',
     label: 'inputNumber',
-    defaultValue: 2
+    initialValue: 2
   }, {
     valueType: 'inputNumberRangeV2',
     field: ['inputNumberRangeV2-min', 'inputNumberRangeV2-max'],
     label: 'inputNumberRangeV2',
-    defaultValue: [2, 5]
+    initialValue: [2, 5]
   }, {
     valueType: 'textArea',
     field: 'textArea',
     label: 'textArea',
-    defaultValue: 'qweqwe'
+    initialValue: 'qweqwe'
   }, {
     valueType: 'switch',
     field: 'switch',
@@ -221,7 +221,7 @@ export default (function () {
     valueType: 'datePicker',
     field: 'datePicker',
     label: 'datePicker',
-    defaultValue: '2025-05-05'
+    initialValue: '2025-05-05'
   }];
   var initialValues = getFieldsDefaultValues(fields);
   // console.log(initialValues);

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

@@ -70,7 +70,7 @@ export default (function () {
     field: 'selectDim',
     label: 'selectDim',
     api: '/selectData',
-    defaultValue: '2'
+    initialValue: '2'
     // 1 2 3 4
   }, {
     valueType: 'select',

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

@@ -98,7 +98,7 @@ export default (function () {
     valueType: 'dateRangeV2',
     field: ['start', 'end'],
     required: true
-    // defaultValue: 1,
+    // initialValue: 1,
   }];
   var initialValues = dataToInitialValues({
     'select-false': '选项1',

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

@@ -30,7 +30,7 @@ export default (function () {
     subItems: [{
       valueType: 'select',
       field: 'avg_cost',
-      defaultValue: 'avg_cost',
+      initialValue: 'avg_cost',
       itemWidth: '150px',
       fieldProps: {
         allowClear: false,
@@ -59,7 +59,7 @@ export default (function () {
       field: 'multipleComponents-input',
       labelWidth: '100px',
       // itemWidth: '20%',
-      defaultValue: '2025-05-05',
+      initialValue: '2025-05-05',
       fieldProps: {
         prefix: /*#__PURE__*/_jsx(UserOutlined, {}),
         disabled: true
@@ -68,7 +68,7 @@ export default (function () {
       valueType: 'treeSelect',
       field: 'multipleComponents-treeSelect',
       // itemWidth: '80%',
-      defaultValue: 'light',
+      initialValue: 'light',
       options: [{
         label: 'Light',
         value: 'light'
@@ -79,7 +79,7 @@ export default (function () {
     }, {
       valueType: 'datePicker',
       field: 'multipleComponents-datePicker',
-      defaultValue: '2025-05-05',
+      initialValue: '2025-05-05',
       dependenciesV2: [{
         action: 'clear',
         field: 'multipleComponents-treeSelect'
@@ -101,12 +101,12 @@ export default (function () {
     // {
     //   valueType: 'inputNumberRangeV2',
     //   field: ['multipleComponents-min', 'multipleComponents-max'],
-    //   defaultValue: [2, 5],
+    //   initialValue: [2, 5],
     // },
     // {
     //   valueType: 'select',
     //   field: 'multipleComponents-select',
-    //   defaultValue: 'light',
+    //   initialValue: 'light',
     //   options: [
     //     {label: 'Light', value: 'light'},
     //     {label: 'Light2', value: 'light2'},
@@ -122,7 +122,7 @@ export default (function () {
     valueType: 'input',
     field: 'input',
     label: 'input',
-    defaultValue: 'input',
+    initialValue: 'input',
     hidden: false,
     rules: [{
       required: true,
@@ -132,7 +132,7 @@ export default (function () {
     valueType: 'select',
     field: 'select',
     label: 'select',
-    defaultValue: 'light',
+    initialValue: 'light',
     options: [{
       label: 'Light',
       value: 'light'
@@ -145,7 +145,7 @@ export default (function () {
     field: 'selectDim',
     label: 'selectDim',
     api: '/selectData',
-    defaultParams: {
+    params: {
       a: 1,
       b: 2
     }
@@ -153,7 +153,7 @@ export default (function () {
     valueType: 'dateRangeV2',
     field: ['dateRangeV2-start', 'dateRangeV2-end'],
     label: 'dateRangeV2',
-    defaultValue: -29,
+    initialValue: -29,
     required: true,
     fieldProps: {
       showTime: true,
@@ -199,7 +199,7 @@ export default (function () {
     valueType: 'radioGroup',
     field: 'radioGroup',
     label: 'radioGroup',
-    defaultValue: 'light',
+    initialValue: 'light',
     options: [{
       label: 'Light',
       value: 'light'
@@ -211,17 +211,17 @@ export default (function () {
     valueType: 'inputNumber',
     field: 'inputNumber',
     label: 'inputNumber',
-    defaultValue: 2
+    initialValue: 2
   }, {
     valueType: 'inputNumberRangeV2',
     field: ['inputNumberRangeV2-min', 'inputNumberRangeV2-max'],
     label: 'inputNumberRangeV2',
-    defaultValue: [2, 5]
+    initialValue: [2, 5]
   }, {
     valueType: 'textArea',
     field: 'textArea',
     label: 'textArea',
-    defaultValue: 'qweqwe'
+    initialValue: 'qweqwe'
   }, {
     valueType: 'switch',
     field: 'switch',
@@ -230,7 +230,7 @@ export default (function () {
     valueType: 'datePicker',
     field: 'datePicker',
     label: 'datePicker',
-    defaultValue: '2025-05-05',
+    initialValue: '2025-05-05',
     dependenciesV2: [{
       field: 'switch',
       action: 'show',
@@ -241,7 +241,7 @@ export default (function () {
     valueType: 'datePicker',
     field: 'datePicker2',
     label: 'datePicker2',
-    defaultValue: '2025-05-05'
+    initialValue: '2025-05-05'
     // dependenciesV2: [
     //   {
     //     field:  'switch',

package/dist/components/base-form/demo/BaseProFormSelectDim.d.ts

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

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

@@ -0,0 +1,253 @@
+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); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+import { RexProConfigProvider } from "../../../context";
+import { ProForm } from '@ant-design/pro-components';
+import { BaseForm } from "../../..";
+import { createIntl } from 'react-intl';
+import { jsx as _jsx } from "react/jsx-runtime";
+var options = [{
+  label: '总裁办公室',
+  value: 'dept_001'
+}, {
+  label: '人力资源部',
+  value: 'dept_002'
+}, {
+  label: '财务部',
+  value: 'dept_003'
+}, {
+  label: '市场营销部',
+  value: 'dept_004'
+}, {
+  label: '销售一部',
+  value: 'dept_005'
+}, {
+  label: '销售二部',
+  value: 'dept_006'
+}, {
+  label: '销售三部',
+  value: 'dept_007'
+}, {
+  label: '客户服务部',
+  value: 'dept_008'
+}, {
+  label: '技术研发部',
+  value: 'dept_009'
+}, {
+  label: '产品设计部',
+  value: 'dept_010'
+}, {
+  label: '前端开发组',
+  value: 'dept_011'
+}, {
+  label: '后端开发组',
+  value: 'dept_012'
+}, {
+  label: '移动开发组',
+  value: 'dept_013'
+}, {
+  label: '测试部',
+  value: 'dept_014'
+}, {
+  label: '运维部',
+  value: 'dept_015'
+}, {
+  label: '数据分析部',
+  value: 'dept_016'
+}, {
+  label: '信息安全部',
+  value: 'dept_017'
+}, {
+  label: '项目管理部',
+  value: 'dept_018'
+}, {
+  label: '质量管理部',
+  value: 'dept_019'
+}, {
+  label: '采购部',
+  value: 'dept_020'
+}, {
+  label: '供应链管理部',
+  value: 'dept_021'
+}, {
+  label: '仓储物流部',
+  value: 'dept_022'
+}, {
+  label: '生产制造部',
+  value: 'dept_023'
+}, {
+  label: '设备管理部',
+  value: 'dept_024'
+}, {
+  label: '品牌策划部',
+  value: 'dept_025'
+}, {
+  label: '公共关系部',
+  value: 'dept_026'
+}, {
+  label: '法务部',
+  value: 'dept_027'
+}, {
+  label: '审计部',
+  value: 'dept_028'
+}, {
+  label: '行政部',
+  value: 'dept_029'
+}, {
+  label: '后勤保障部',
+  value: 'dept_030'
+}, {
+  label: '国际业务部',
+  value: 'dept_031'
+}, {
+  label: '华东区分公司',
+  value: 'dept_032'
+}, {
+  label: '华南区分公司',
+  value: 'dept_033'
+}, {
+  label: '华北区分公司',
+  value: 'dept_034'
+}, {
+  label: '西南区分公司',
+  value: 'dept_035'
+}, {
+  label: '东北区分公司',
+  value: 'dept_036'
+}, {
+  label: '战略发展部',
+  value: 'dept_037'
+}, {
+  label: '投资并购部',
+  value: 'dept_038'
+}, {
+  label: '企业文化部',
+  value: 'dept_039'
+}, {
+  label: '培训发展部',
+  value: 'dept_040'
+}, {
+  label: '招聘管理部',
+  value: 'dept_041'
+}, {
+  label: '薪酬绩效部',
+  value: 'dept_042'
+}, {
+  label: '员工关系部',
+  value: 'dept_043'
+}, {
+  label: '电商运营部',
+  value: 'dept_044'
+}, {
+  label: '新媒体运营部',
+  value: 'dept_045'
+}, {
+  label: '用户增长部',
+  value: 'dept_046'
+}, {
+  label: '商务拓展部',
+  value: 'dept_047'
+}, {
+  label: '渠道管理部',
+  value: 'dept_048'
+}, {
+  label: '售后服务部',
+  value: 'dept_049'
+}, {
+  label: '技术支持部',
+  value: 'dept_050'
+}];
+export default (function () {
+  return /*#__PURE__*/_jsx(RexProConfigProvider, {
+    value: {
+      intl: createIntl({
+        locale: 'en-US',
+        messages: {},
+        onError: function onError() {}
+      }),
+      apiClient: function () {
+        var _apiClient = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, params) {
+          var _ref, keyWords, customKey, id, searchValue;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _ref = params, keyWords = _ref.keyWords, customKey = _ref.customKey, id = _ref.id;
+                searchValue = keyWords !== null && keyWords !== void 0 ? keyWords : customKey;
+                fetch(api, {
+                  method: 'post',
+                  body: JSON.stringify(params)
+                });
+                if (!searchValue) {
+                  _context.next = 5;
+                  break;
+                }
+                return _context.abrupt("return", options.filter(function (ii) {
+                  return ii.label.includes(searchValue) || ii.value.includes(searchValue);
+                }));
+              case 5:
+                if (!id) {
+                  _context.next = 7;
+                  break;
+                }
+                return _context.abrupt("return", options.filter(function (ii) {
+                  return ii.value === id;
+                }));
+              case 7:
+                return _context.abrupt("return", options.slice(0, 10));
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function apiClient(_x, _x2) {
+          return _apiClient.apply(this, arguments);
+        }
+        return apiClient;
+      }()
+    },
+    children: /*#__PURE__*/_jsx(ProForm
+    // initialValues={{}}
+    , {
+      layout: "horizontal",
+      onFinish: function onFinish(values) {
+        console.log(values);
+      },
+      children: /*#__PURE__*/_jsx(BaseForm, {
+        fields: [{
+          valueType: 'selectDim',
+          field: 'selectDim1',
+          label: '[模式 0]使用 selectDim1, keyWords 作为搜索条件key',
+          api: '/options-1'
+          // apiSearchKey: '',
+          // apiSearchValueKey: '',
+        }, {
+          valueType: 'selectDim',
+          field: 'selectDim2-1',
+          label: '[模式 1(apiSearchKey)]只使用 keyWords 作为搜索条件key',
+          api: '/options-2-1',
+          apiSearchKey: false
+          // apiSearchValueKey: '',
+        }, {
+          valueType: 'selectDim',
+          field: 'selectDim2-2',
+          label: '[模式 2(apiSearchKey)]使用 customKey, keyWords 作为搜索条件key',
+          api: '/options-2-2',
+          apiSearchKey: 'customKey'
+          // apiSearchValueKey: '',
+        }, {
+          valueType: 'selectDim',
+          field: 'selectDim3',
+          label: '用于数据回显, 使用 id 作为搜索条件key',
+          api: '/options-3',
+          params: {
+            otherData: '1231'
+          },
+          apiSearchValueKey: 'id',
+          initialValue: 'dept_044'
+        }]
+      })
+    })
+  });
+});

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

@@ -1,5 +1,5 @@
 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 = ["valueType", "label", "defaultValue", "childWidths", "fieldProps", "formItemProps", "params", "defaultParams"],
+var _excluded = ["valueType", "label", "childWidths", "fieldProps", "formItemProps", "params"],
   _excluded2 = ["formItemProps", "fieldProps"],
   _excluded3 = ["formItemProps", "fieldProps", "name"],
   _excluded4 = ["formItemProps", "fieldProps"],
@@ -72,13 +72,11 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
     _outConfig$item = outConfig.item,
     valueType = _outConfig$item.valueType,
     label = _outConfig$item.label,
-    defaultValue = _outConfig$item.defaultValue,
     _outConfig$item$child = _outConfig$item.childWidths,
     childWidths = _outConfig$item$child === void 0 ? [] : _outConfig$item$child,
     rawFieldProps = _outConfig$item.fieldProps,
     rawFormItemProps = _outConfig$item.formItemProps,
     params = _outConfig$item.params,
-    defaultParams = _outConfig$item.defaultParams,
     otherProps = _objectWithoutProperties(_outConfig$item, _excluded),
     requestOptions = outConfig.requestOptions,
     itemWidth = outConfig.itemWidth,
@@ -305,26 +303,22 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
   {
     if (valueType === 'checkbox') {
       return dynamicCom(ProFormCheckbox, {
-        name: splitKeyStr(keyStr),
-        initialValue: defaultValue
+        name: splitKeyStr(keyStr)
       });
     }
     if (valueType === 'switch') {
       return dynamicCom(ProFormSwitch, {
-        name: splitKeyStr(keyStr),
-        initialValue: defaultValue
+        name: splitKeyStr(keyStr)
       });
     }
     if (valueType === 'datePicker') {
       return dynamicCom(ProFormDatePicker, {
-        name: splitKeyStr(keyStr),
-        initialValue: defaultValue
+        name: splitKeyStr(keyStr)
       });
     }
     if (valueType === 'input') {
       return dynamicCom(ProFormText, {
-        name: splitKeyStr(keyStr),
-        initialValue: defaultValue
+        name: splitKeyStr(keyStr)
       });
     }
     if (valueType === 'select') {
@@ -337,60 +331,71 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
         debounceTime: 300,
         name: splitKeyStr(keyStr),
         options: item.api ? undefined : item.options,
-        params: item.api ? _objectSpread(_objectSpread(_objectSpread({}, values), item.params), item.defaultParams) : undefined,
-        initialValue: defaultValue,
+        params: item.api ? _objectSpread(_objectSpread({}, values), item.params) : undefined,
         request: function () {
           if (!item.api) return undefined;
           var map = {};
-          return /*#__PURE__*/function () {
-            var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref4) {
-              var keyWords, params, key, res;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    keyWords = _ref4.keyWords, params = _objectWithoutProperties(_ref4, _excluded7);
-                    key = JSON.stringify(params || '');
-                    if (!map[key]) {
-                      _context.next = 4;
-                      break;
-                    }
-                    return _context.abrupt("return", map[key]);
-                  case 4:
-                    _context.next = 6;
-                    return requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item);
-                  case 6:
-                    _context.t0 = _context.sent;
-                    if (_context.t0) {
-                      _context.next = 9;
-                      break;
-                    }
-                    _context.t0 = [];
-                  case 9:
-                    res = _context.t0;
-                    map[key] = res;
-                    return _context.abrupt("return", res);
-                  case 12:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }));
-            return function (_x) {
-              return _ref5.apply(this, arguments);
-            };
-          }();
+          return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            var _ref5,
+              keyWords,
+              params,
+              key,
+              res,
+              _args = arguments;
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _ref5 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, keyWords = _ref5.keyWords, params = _objectWithoutProperties(_ref5, _excluded7);
+                  key = JSON.stringify(params);
+                  if (!map[key]) {
+                    _context.next = 4;
+                    break;
+                  }
+                  return _context.abrupt("return", map[key]);
+                case 4:
+                  _context.next = 6;
+                  return requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item);
+                case 6:
+                  _context.t0 = _context.sent;
+                  if (_context.t0) {
+                    _context.next = 9;
+                    break;
+                  }
+                  _context.t0 = [];
+                case 9:
+                  res = _context.t0;
+                  map[key] = res;
+                  return _context.abrupt("return", res);
+                case 12:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
         }()
       });
     }
     if (valueType === 'selectDim') {
-      var paramsProp = _objectSpread(_objectSpread(_objectSpread({}, values), item.params), item.defaultParams);
-      // console.log(1111, params);
       var keys = Array.isArray(splitKeyStr(keyStr)) ? splitKeyStr(keyStr) : [splitKeyStr(keyStr)];
+      // 用于标记是否已经初始化过
+      var initialized = false;
       return /*#__PURE__*/_jsx(ProFormDependency, {
         name: keys,
         children: function children(dependData) {
           // console.log(2222, dependData);
 
+          var paramsProp = _objectSpread(_objectSpread({}, values), item.params);
+          // 如果配置了 apiSearchValueKey，则将依赖数据 dependData[keyStr] 赋值到对应参数
+          if (typeof item.apiSearchValueKey === 'string') {
+            var currentValue = dependData[keyStr];
+            // 首次渲染且值为空时，使用初始值；后续使用表单实际值
+            if (!initialized && currentValue === undefined) {
+              paramsProp[item.apiSearchValueKey] = item.initialValue;
+            } else {
+              paramsProp[item.apiSearchValueKey] = currentValue;
+            }
+            initialized = true;
+          }
           return dynamicCom(ProFormSelect, {
             showSearch: true,
             debounceTime: 300,
@@ -400,7 +405,6 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
             mode: item.multiple ? 'multiple' : 'single',
             params: paramsProp,
             name: keys,
-            initialValue: defaultValue,
             request: function () {
               var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
                 var _params$keyWords, keyWords, restParams, newParams;
@@ -409,12 +413,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
                     case 0:
                       // 拆分参数，keyWords 为搜索关键字，其余为接口参数
                       _params$keyWords = params.keyWords, keyWords = _params$keyWords === void 0 ? '' : _params$keyWords, restParams = _objectWithoutProperties(params, _excluded8);
-                      newParams = restParams; // 如果配置了 apiSearchValueKey，则将依赖数据 dependData[keyStr] 赋值到对应参数
-                      if (typeof item.apiSearchValueKey === 'string') {
-                        newParams[item.apiSearchValueKey] = dependData[keyStr] || undefined;
-                      }
-
-                      // 处理搜索关键字参数的传递方式
+                      newParams = restParams; // 处理搜索关键字参数的传递方式
                       if (item.apiSearchKey === false) {
                         // 配置为 false，默认传 keyWords 字段
                         newParams.keyWords = keyWords || undefined;
@@ -429,13 +428,13 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
 
                       // 发起接口请求，返回选项数据
                       return _context2.abrupt("return", (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, newParams, item)) || []);
-                    case 5:
+                    case 4:
                     case "end":
                       return _context2.stop();
                   }
                 }, _callee2);
               }));
-              function request(_x2) {
+              function request(_x) {
                 return _request.apply(this, arguments);
               }
               return request;
@@ -472,8 +471,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
         }), formatMessage({
           id: 'rex.components.base-form.placeholder.date-range.end',
           defaultMessage: '结束时间'
-        })],
-        initialValue: defaultValue
+        })]
       });
     }
     if (valueType === 'cascader') {
@@ -489,8 +487,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
             children: 'children'
           }
         },
-        initialValue: defaultValue,
-        params: item.api ? _objectSpread(_objectSpread(_objectSpread({}, values), item.params), item.defaultParams) : undefined,
+        params: item.api ? _objectSpread(_objectSpread({}, values), item.params) : undefined,
         name: splitKeyStr(keyStr),
         request: item.api ? ( /*#__PURE__*/function () {
           var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
@@ -504,7 +501,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
               }
             }, _callee3);
           }));
-          return function (_x3) {
+          return function (_x2) {
             return _ref7.apply(this, arguments);
           };
         }()) : undefined
@@ -525,8 +522,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
           },
           treeNodeFilterProp: 'label'
         },
-        initialValue: defaultValue,
-        params: item.api ? _objectSpread(_objectSpread(_objectSpread({}, values), item.params), item.defaultParams) : undefined,
+        params: item.api ? _objectSpread(_objectSpread({}, values), item.params) : undefined,
         name: splitKeyStr(keyStr),
         request: item.api ? ( /*#__PURE__*/function () {
           var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
@@ -540,7 +536,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
               }
             }, _callee4);
           }));
-          return function (_x4) {
+          return function (_x3) {
             return _ref8.apply(this, arguments);
           };
         }()) : undefined
@@ -549,9 +545,8 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
     if (valueType === 'checkboxGroup') {
       return dynamicCom(ProFormCheckbox.Group, {
         options: item.api ? undefined : item.options,
-        params: item.api ? _objectSpread(_objectSpread(_objectSpread({}, values), item.params), item.defaultParams) : undefined,
+        params: item.api ? _objectSpread(_objectSpread({}, values), item.params) : undefined,
         layout: 'horizontal',
-        initialValue: defaultValue,
         name: splitKeyStr(keyStr),
         request: item.api ? ( /*#__PURE__*/function () {
           var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
@@ -565,7 +560,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
               }
             }, _callee5);
           }));
-          return function (_x5) {
+          return function (_x4) {
             return _ref9.apply(this, arguments);
           };
         }()) : undefined
@@ -574,9 +569,8 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
     if (valueType === 'radioGroup') {
       return dynamicCom(ProFormRadio.Group, {
         options: item.api ? undefined : item.options,
-        params: item.api ? _objectSpread(_objectSpread(_objectSpread({}, values), item.params), item.defaultParams) : undefined,
+        params: item.api ? _objectSpread(_objectSpread({}, values), item.params) : undefined,
         layout: 'horizontal',
-        initialValue: defaultValue,
         name: splitKeyStr(keyStr),
         request: item.api ? ( /*#__PURE__*/function () {
           var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
@@ -590,7 +584,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
               }
             }, _callee6);
           }));
-          return function (_x6) {
+          return function (_x5) {
             return _ref10.apply(this, arguments);
           };
         }()) : undefined
@@ -598,13 +592,11 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
     }
     if (valueType === 'inputNumber') {
       return dynamicCom(ProFormDigit, {
-        initialValue: defaultValue,
         name: splitKeyStr(keyStr)
       });
     }
     if (valueType === 'inputNumberRange') {
       return dynamicCom(ProFormDigitRange, {
-        initialValue: defaultValue,
         name: keyStr,
         transform: function transform(inrValues) {
           return _defineProperty(_defineProperty({}, fields[0], inrValues[0]), fields[1], inrValues[1]);
@@ -620,7 +612,6 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
     }
     if (valueType === 'inputNumberRangeV2') {
       return dynamicCom(ProFormDigitRangeV2, {
-        initialValue: defaultValue,
         // name: keyStr as [string, string],
         name: [splitKeyStr(fields[0]), splitKeyStr(fields[1])],
         // transform: (inrValues: Array<number | undefined>) => ({
@@ -638,13 +629,11 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
     }
     if (valueType === 'textArea') {
       return dynamicCom(ProFormTextArea, {
-        initialValue: defaultValue,
         name: splitKeyStr(keyStr)
       });
     }
     if (valueType === 'hidden') {
       return dynamicCom(ProFormText, {
-        initialValue: defaultValue,
         name: splitKeyStr(keyStr),
         hidden: true
       });

package/dist/components/base-form/types/field-type.d.ts

@@ -124,9 +124,8 @@ export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
     /** 提示信息 */
     tooltip?: string;
     /**
-     * 字段对应默认值
-     * - 需要手动调用函数提取,再设置
-     * - 扩展,注入form.item 上
+     * @deprecated 字段对应默认值 * - 需要手动调用函数提取,再设置 * - 扩展,注入form.item 上
+     * - 推荐使用 form 的 initialValues 统一设置
      */
     defaultValue?: string | string[] | boolean | number | number[];
     /** 控制隐藏 */

package/dist/components/data-cell/data-cell.js

@@ -1,18 +1,25 @@
+import { useRexProConfigProvider } from "../../context";
 import React from 'react';
 import { cellItemMap } from "./modules/cellItemMap";
 import { Wrapper } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var DataCell = function DataCell(_ref) {
   var items = _ref.items,
-    onClick = _ref.onClick;
-  // const arr = items.map(ii => cellItemMap[ii.type](ii, onClick));
-  // return arr.map((node, index) => <div key={index} className={`data-cell-row-item ${ii.type}`}>{node}</div>);
+    onClick = _ref.onClick,
+    propSystemHistory = _ref.systemHistory;
+  var _useRexProConfigProvi = useRexProConfigProvider(),
+    contextSystemHistory = _useRexProConfigProvi.systemHistory;
+  var systemHistory = propSystemHistory !== null && propSystemHistory !== void 0 ? propSystemHistory : contextSystemHistory;
   return items.map(function (item, index) {
     var _cellItemMap$item$typ;
     return /*#__PURE__*/_jsx(Wrapper, {
       style: item.rootStyle,
       className: "data-cell-row-item ".concat(item.type),
-      children: (_cellItemMap$item$typ = cellItemMap[item.type]) === null || _cellItemMap$item$typ === void 0 ? void 0 : _cellItemMap$item$typ.call(cellItemMap, item, onClick)
+      children: (_cellItemMap$item$typ = cellItemMap[item.type]) === null || _cellItemMap$item$typ === void 0 ? void 0 : _cellItemMap$item$typ.call(cellItemMap, {
+        item: item,
+        click: onClick,
+        systemHistory: systemHistory
+      })
     }, index);
   });
 };

package/dist/components/data-cell/modules/cellItemMap.d.ts

@@ -1,3 +1,11 @@
+import { useRexProConfigProvider } from "../../..";
 import React from 'react';
 import { IDataCellProps, TDataCellType, TGroupV2 } from '../types';
-export declare const cellItemMap: Record<TDataCellType, (item: IDataCellProps['items'][number], click?: (rawItem: IDataCellProps['items'][number], subItem?: Exclude<TGroupV2['props'], undefined>['items'][number]) => void) => React.ReactNode>;
+export declare const cellItemMap: TCellItemMap;
+type TCellItemFnData = {
+    item: IDataCellProps['items'][number];
+    click?: (rawItem: IDataCellProps['items'][number], subItem?: Exclude<TGroupV2['props'], undefined>['items'][number]) => void;
+    systemHistory?: ReturnType<typeof useRexProConfigProvider>['systemHistory'];
+};
+type TCellItemMap = Record<TDataCellType, (data: TCellItemFnData) => React.ReactNode>;
+export {};

package/dist/components/data-cell/modules/cellItemMap.js

@@ -14,7 +14,6 @@ import { EyeOutlined } from '@ant-design/icons';
 import { downloadResourceFile, Icons, MediaViewer, showFileViewer } from "../../..";
 import { Tag, Tooltip, Typography } from 'antd';
 import React from 'react';
-import { Navigate } from 'react-router';
 import { DataCell } from "../data-cell";
 import { DataCellRowText, DataCellRowTextLabel, DataCellRowTextValue } from "../style";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -27,7 +26,7 @@ var isEmpty = function isEmpty(val) {
 };
 
 /** 动作块渲染 */
-var actionRender = function actionRender(item, action, node, click) {
+var actionRender = function actionRender(item, action, node, click, systemHistory) {
   var tooltipBox = function tooltipBox(content) {
     if (item.tooltip) {
       return /*#__PURE__*/_jsx(Tooltip, {
@@ -70,12 +69,9 @@ var actionRender = function actionRender(item, action, node, click) {
       onClick: function onClick(e) {
         if (target !== '_blank') {
           e.preventDefault();
-          try {
-            Navigate({
-              to: item.value || '',
-              replace: false
-            });
-          } catch (error) {
+          if (systemHistory) {
+            systemHistory === null || systemHistory === void 0 || systemHistory.push(item.value || '');
+          } else {
             window.location.href = item.value || '';
           }
         }
@@ -132,7 +128,10 @@ var actionRender = function actionRender(item, action, node, click) {
 };
 export var cellItemMap = {
   /** 文本块 */
-  text: function text(item, click) {
+  text: function text(_ref) {
+    var item = _ref.item,
+      click = _ref.click,
+      systemHistory = _ref.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return !isEmpty(props.label) || !isEmpty(props.value) ? /*#__PURE__*/_jsxs(DataCellRowText, {
@@ -154,7 +153,11 @@ export var cellItemMap = {
           return /*#__PURE__*/_jsx(DataCellRowTextValue, {
             className: "data-cell-row-text-value",
             style: props === null || props === void 0 ? void 0 : props.valueStyle,
-            children: cellItemMap[props.value.type](props.value, click)
+            children: cellItemMap[props.value.type]({
+              item: props.value,
+              click: click,
+              systemHistory: systemHistory
+            })
           });
         }
         return /*#__PURE__*/_jsx(DataCellRowTextValue, {
@@ -172,7 +175,8 @@ export var cellItemMap = {
     }) : undefined;
   },
   /** 图片块 */
-  img: function img(item) {
+  img: function img(_ref2) {
+    var item = _ref2.item;
     var props = item.props;
     return /*#__PURE__*/_jsx(MediaViewer, _objectSpread({
       src: props === null || props === void 0 ? void 0 : props.value,
@@ -180,11 +184,12 @@ export var cellItemMap = {
     }, props));
   },
   /** 链接块 */
-  link: function link(item, click) {
+  link: function link(_ref3) {
+    var item = _ref3.item,
+      click = _ref3.click,
+      systemHistory = _ref3.systemHistory;
     var props = item.props;
     if (!props) return undefined;
-
-    // return actionRender(props, props.action, props.label, () => click?.(item));
     return /*#__PURE__*/_jsxs(DataCellRowText, {
       className: "data-cell-row-text link",
       children: [/*#__PURE__*/_jsx(DataCellRowTextValue, {
@@ -196,7 +201,7 @@ export var cellItemMap = {
         },
         children: actionRender(props, props.action, props.label, function () {
           return click === null || click === void 0 ? void 0 : click(item);
-        })
+        }, systemHistory)
       }), props.copyable ? /*#__PURE__*/_jsx(Typography.Paragraph, {
         copyable: {
           text: typeof props.copyable === 'string' ? props.copyable : "".concat(props.label)
@@ -205,7 +210,10 @@ export var cellItemMap = {
     });
   },
   /** 链接组 */
-  'link-group': function linkGroup(item, click) {
+  'link-group': function linkGroup(_ref4) {
+    var item = _ref4.item,
+      click = _ref4.click,
+      systemHistory = _ref4.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return /*#__PURE__*/_jsx("div", {
@@ -219,9 +227,13 @@ export var cellItemMap = {
             display: 'inline-flex'
           },
           children: [cellItemMap.link({
-            props: child,
-            type: 'link'
-          }, click), (props === null || props === void 0 ? void 0 : props.items.length) - 1 === index ? '' : /*#__PURE__*/_jsx("span", {
+            item: {
+              props: child,
+              type: 'link'
+            },
+            click: click,
+            systemHistory: systemHistory
+          }), (props === null || props === void 0 ? void 0 : props.items.length) - 1 === index ? '' : /*#__PURE__*/_jsx("span", {
             style: {
               paddingInline: 2
             },
@@ -232,7 +244,9 @@ export var cellItemMap = {
     });
   },
   /** tag块 */
-  tag: function tag(item, click) {
+  tag: function tag(_ref5) {
+    var item = _ref5.item,
+      click = _ref5.click;
     var props = item.props;
     if (!props) return undefined;
     var color = function () {
@@ -264,8 +278,12 @@ export var cellItemMap = {
       }) : '']
     })) : undefined;
   },
-  icon: function icon(item, click) {
+  /** 图标块 */
+  icon: function icon(_ref6) {
     var _props$action;
+    var item = _ref6.item,
+      click = _ref6.click,
+      systemHistory = _ref6.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return actionRender(props, (_props$action = props.action) !== null && _props$action !== void 0 ? _props$action : 'default', /*#__PURE__*/_jsx(Icons, {
@@ -273,32 +291,39 @@ export var cellItemMap = {
       name: props.value
     }), function () {
       return click === null || click === void 0 ? void 0 : click(item);
-    });
+    }, systemHistory);
   },
   /** 块组 */
-  group: function group(item, click) {
+  group: function group(_ref7) {
+    var item = _ref7.item,
+      click = _ref7.click,
+      systemHistory = _ref7.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return /*#__PURE__*/_jsx("div", {
       style: props.style,
       children: /*#__PURE__*/_jsx(DataCell, {
         items: props.items,
-        onClick: click
+        onClick: click,
+        systemHistory: systemHistory
       })
     });
   },
-  'group-v2': function groupV2(item, click) {
+  /** 块组v2 */
+  'group-v2': function groupV2(_ref8) {
     var _props$items;
+    var item = _ref8.item,
+      click = _ref8.click,
+      systemHistory = _ref8.systemHistory;
     var props = item.props;
     if (!props) return undefined;
-    // itemsSeparator itemsStyle itemsDirection itemsGap
-    // ellipsis tooltip copyable action urlTarget url style
     var renderItem = function renderItem(subItem, index) {
       var count = 0;
       if (subItem.type === 'group-v2') {
         return /*#__PURE__*/_jsx(DataCell, {
           items: [subItem],
-          onClick: click
+          onClick: click,
+          systemHistory: systemHistory
         }, "renderItem-".concat(index, "-").concat(count++));
       }
       var ellipsis = subItem.ellipsis,
@@ -312,9 +337,7 @@ export var cellItemMap = {
         other = _objectWithoutProperties(subItem, _excluded);
       var renderBox = function renderBox(content) {
         var afterContent = /*#__PURE__*/_jsx(DataCellRowTextValue, {
-          className: "data-cell-group-v2-value-item"
-          // title={typeof content === 'string' ? content : ''}
-          ,
+          className: "data-cell-group-v2-value-item",
           ellipsis: ellipsis,
           children: content
         }, "renderItem-".concat(index, "-").concat(count++));
@@ -341,12 +364,24 @@ export var cellItemMap = {
           });
         }
         if (action === 'url') {
+          var target = urlTarget !== null && urlTarget !== void 0 ? urlTarget : '_blank';
           return /*#__PURE__*/_jsx("a", {
-            href: url,
-            target: urlTarget !== null && urlTarget !== void 0 ? urlTarget : '_blank',
+            href: target === '_blank' ? url : 'void',
+            target: target,
+            rel: "noreferrer",
             style: _objectSpread({
               display: 'inline-flex'
             }, style),
+            onClick: function onClick(e) {
+              if (target !== '_blank') {
+                e.preventDefault();
+                try {
+                  systemHistory === null || systemHistory === void 0 || systemHistory.push(url || '');
+                } catch (_unused) {
+                  window.location.href = url || '';
+                }
+              }
+            },
             children: afterContent
           }, "renderItem-".concat(index, "-").concat(count++));
         }
@@ -400,18 +435,18 @@ export var cellItemMap = {
           return renderBox(subItem.value);
         case 'img':
           {
-            var _ref = other,
-              mediaViewerType = _ref.mediaViewerType,
-              otherProps = _objectWithoutProperties(_ref, _excluded2);
+            var _ref9 = other,
+              mediaViewerType = _ref9.mediaViewerType,
+              otherProps = _objectWithoutProperties(_ref9, _excluded2);
             return renderBox( /*#__PURE__*/_jsx(MediaViewer, _objectSpread({
               type: mediaViewerType
             }, otherProps)));
           }
         case 'tag':
           {
-            var _ref2 = other,
-              value = _ref2.value,
-              _otherProps = _objectWithoutProperties(_ref2, _excluded3);
+            var _ref10 = other,
+              value = _ref10.value,
+              _otherProps = _objectWithoutProperties(_ref10, _excluded3);
             var color = function () {
               if (subItem.color !== null && _typeof(subItem.color) === 'object') {
                 var _subItem$color, _subItem$color$toHexS;
@@ -429,9 +464,9 @@ export var cellItemMap = {
           }
         case 'icon':
           {
-            var _ref3 = other,
-              iconsType = _ref3.iconsType,
-              _otherProps2 = _objectWithoutProperties(_ref3, _excluded4);
+            var _ref11 = other,
+              iconsType = _ref11.iconsType,
+              _otherProps2 = _objectWithoutProperties(_ref11, _excluded4);
             return renderBox( /*#__PURE__*/_jsx(Icons, _objectSpread({
               type: iconsType
             }, _otherProps2)));

package/dist/components/data-cell/types.d.ts

@@ -1,4 +1,4 @@
-import { Icons, MediaViewer } from "../..";
+import { Icons, MediaViewer, useRexProConfigProvider } from "../..";
 import { GetProps, Tag } from 'antd';
 import { HTMLAttributeAnchorTarget } from 'react';
 /** 组件props */
@@ -7,6 +7,8 @@ export interface IDataCellProps {
     items: Array<TGroupV2 | IDataCellItem<TDataCellType>>;
     /** 点击回调 */
     onClick?: (item: IDataCellItem, subItem?: Exclude<TGroupV2['props'], undefined>['items'][number]) => void;
+    /** 系统路由历史对象，用于内部跳转 */
+    systemHistory?: ReturnType<typeof useRexProConfigProvider>['systemHistory'];
 }
 export interface IDataCellItem<T extends TDataCellType = TDataCellType> {
     /** 组件类型 */

package/dist/context/rex-pro-config-provider/rex-pro-config-context.d.ts

@@ -19,6 +19,11 @@ export interface RexProConfigContextType {
             }>;
         };
     }>>;
+    /** 系统路由,外部传入 */
+    systemHistory?: History & {
+        push: (to: string, state?: unknown) => void;
+        replace: (to: string, state?: unknown) => void;
+    };
     /** 支持一些自定义属性 */
     [key: string]: unknown | undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -80,7 +80,6 @@
     "react-dom": "^18.3.1",
     "react-intl": "^7.1.11",
     "react-quick-pinch-zoom": "^5.1.1",
-    "react-router": "6",
     "styled-components": "^6.1.19"
   },
   "devDependencies": {
@@ -110,8 +109,7 @@
     "antd": ">=5.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
-    "react-intl": ">=3.0.0",
-    "react-router": ">=6.0.0"
+    "react-intl": ">=3.0.0"
   },
   "publishConfig": {
     "access": "public"