@pisell/materials 1.0.504 → 1.0.505

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -294,12 +294,14 @@ export var withOptions = function withOptions(WrappedComponent) {
       if (optionSourceType !== 'api') {
         return propsOptions;
       }
-      return ((_list$data = list.data) === null || _list$data === void 0 ? void 0 : (_list$data$data = _list$data.data) === null || _list$data$data === void 0 ? void 0 : _list$data$data.map(function (item) {
+      return (((_list$data = list.data) === null || _list$data === void 0 ? void 0 : (_list$data$data = _list$data.data) === null || _list$data$data === void 0 ? void 0 : _list$data$data.map(function (item) {
         return {
           label: translationOriginal(item[labelField]),
           value: item[valueField]
         };
-      })) || [];
+      })) || []).sort(function (a, b) {
+        return a.label.localeCompare(b.label);
+      });
     }, [propsOptions, optionSourceType, list === null || list === void 0 ? void 0 : (_list$data2 = list.data) === null || _list$data2 === void 0 ? void 0 : _list$data2.data]);
     return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, {
       options: options

package/es/components/dataSourceComponents/dataSourceTable/filter/index.js

@@ -145,7 +145,8 @@ var Filter = function Filter(props) {
       style: {
         width: 200,
         margin: 0
-      }
+      },
+      allowClear: true
     }) : null;
   }, [search]);
   return /*#__PURE__*/React.createElement(Form, {

package/es/components/dataSourceComponents/dataSourceTable/filter/utils.js

@@ -48,6 +48,7 @@ var getCptProps = function getCptProps(field, cptType, item) {
   props.allowClear = true;
   if (cptType === 'FormItemSelect') {
     props.mode = 'multiple';
+    props.showSearch = true;
   }
   if (['Select', 'Radio.Group', 'Checkbox.Group'].includes(field === null || field === void 0 ? void 0 : (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2['x-component']) && ((field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : (_field$uiSchema3$enum = _field$uiSchema3.enum) === null || _field$uiSchema3$enum === void 0 ? void 0 : _field$uiSchema3$enum.length) || 0) > 0) {
     var _field$uiSchema4, _field$uiSchema5;

package/es/components/dataSourceComponents/fields/Translation/BaseTranslation.js

@@ -52,7 +52,7 @@ var Translation = function Translation(_ref) {
       var _ref3 = _slicedToArray(_ref2, 2),
         key = _ref3[0],
         val = _ref3[1];
-      return val;
+      return key !== 'original' && val;
     });
   }, [value]);
   var handleInputChange = useCallback(function (lang) {

package/es/components/dataSourceComponents/hooks/useActions.js

@@ -2,6 +2,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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 { useMemo } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import PisellToast from "../../pisellToast";
 import useFormat from "../dataSourceTable/hooks/useFormat";
@@ -41,8 +42,16 @@ var useActions = function useActions() {
     formatListResult = _useFormat.formatListResult,
     formatListParams = _useFormat.formatListParams,
     formatCreateUpdateParams = _useFormat.formatCreateUpdateParams;
+
+  // 真实currentRecord 
+  var currentRecord = useMemo(function () {
+    return parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(currentValue, {});
+  }, [currentValue, parseVariable]);
   var getParsedActions = useMemoizedFn(function () {
-    return parseActions(originalActions, {});
+    // 目前接口使用变量还无法在界面配置 所以这里默认追加currentRecord
+    return parseActions(originalActions, {
+      currentRecord: currentRecord
+    });
   });
 
   // 生成自定义 API 请求函数

package/es/components/table/Table/index.js

@@ -43,7 +43,8 @@ var GridViewTable = function GridViewTable(_ref) {
   }) || [];
   var tableWrapRef = useRef(null);
   var defaultDataSource = state.dataSource,
-    originDataSource = state.originDataSource;
+    originDataSource = state.originDataSource,
+    isTerminal = state.isTerminal;
   var handleSave = useMemoizedFn(function (row) {
     var newData = _toConsumableArray(defaultDataSource);
     var index = newData.findIndex(function (item) {
@@ -114,6 +115,7 @@ var GridViewTable = function GridViewTable(_ref) {
     className: 'materials-grid-table-wrap',
     ref: tableWrapRef
   }, /*#__PURE__*/React.createElement(AutoSizerContent, {
+    isTerminal: isTerminal,
     tableWrapRef: tableWrapRef,
     dataSource: dataSource,
     tableProps: tableProps,
@@ -129,7 +131,8 @@ var AutoSizerContent = function AutoSizerContent(props) {
     paginationConfig = props.paginationConfig,
     columns = props.columns,
     components = props.components,
-    tableWrapRef = props.tableWrapRef;
+    tableWrapRef = props.tableWrapRef,
+    isTerminal = props.isTerminal;
   var _ref3 = useSize(tableWrapRef) || {},
     height = _ref3.height;
   var debouncedHeight = useDebounce(height, {
@@ -144,7 +147,7 @@ var AutoSizerContent = function AutoSizerContent(props) {
     return total > ((tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio5 = tableProps.pagination) === null || _tableProps$paginatio5 === void 0 ? void 0 : _tableProps$paginatio5.pageSize) || (tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio6 = tableProps.pagination) === null || _tableProps$paginatio6 === void 0 ? void 0 : (_tableProps$paginatio7 = _tableProps$paginatio6.pageSizeOptions) === null || _tableProps$paginatio7 === void 0 ? void 0 : _tableProps$paginatio7[0]) || 10) || (tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio8 = tableProps.pagination) === null || _tableProps$paginatio8 === void 0 ? void 0 : _tableProps$paginatio8.showPagination) && total > 10;
   }, [tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio9 = tableProps.pagination) === null || _tableProps$paginatio9 === void 0 ? void 0 : _tableProps$paginatio9.localPagination, tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio10 = tableProps.pagination) === null || _tableProps$paginatio10 === void 0 ? void 0 : _tableProps$paginatio10.total, dataSource.length, tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio11 = tableProps.pagination) === null || _tableProps$paginatio11 === void 0 ? void 0 : (_tableProps$paginatio12 = _tableProps$paginatio11.pageSizeOptions) === null || _tableProps$paginatio12 === void 0 ? void 0 : _tableProps$paginatio12[0]]);
   var scroll = useGenScroll({
-    wrapHeight: debouncedHeight || 500,
+    wrapHeight: height || 500,
     scroll: tableProps.scroll,
     columns: columns,
     isShowPagination: isShowPagination
@@ -152,18 +155,26 @@ var AutoSizerContent = function AutoSizerContent(props) {
   var debouncedScroll = useDebounce(scroll, {
     wait: 200
   });
+  var platformScroll = useMemo(function () {
+    if (isTerminal) {
+      return debouncedScroll;
+    }
+    return scroll;
+  }, [debouncedScroll, scroll, isTerminal]);
   var basicTable = useMemo(function () {
+    if (!height) {
+      return null;
+    }
     return /*#__PURE__*/React.createElement(BasicTable, _extends({
-      key: debouncedScroll,
       dataSource: dataSource,
       columns: columns,
       className: 'grid-view-table',
       components: components
     }, tableProps, {
-      scroll: debouncedScroll,
+      scroll: platformScroll,
       pagination: paginationConfig
     }));
-  }, [debouncedScroll, dataSource, columns, components, paginationConfig, tableProps]);
+  }, [height, platformScroll, dataSource, columns, components, paginationConfig, tableProps]);
   return /*#__PURE__*/React.createElement(SortRow, {
     rowKey: tableProps.rowKey,
     onSortChange: tableProps.onSortChange

package/es/components/table/index.js

@@ -180,7 +180,11 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
       type: 'setUtils',
       payload: utils || {}
     });
-  }, [utils]);
+    modal.dispatch({
+      type: 'setIsTerminal',
+      payload: isTerminal
+    });
+  }, [utils, isTerminal]);
   useEffect(function () {
     modal.dispatch({
       type: 'setDefaultColumns',

package/es/components/table/model.d.ts

@@ -12,6 +12,7 @@ interface FormState {
     quickFilter: FilterItemProps[];
     otherFilter: FilterItemProps[];
     utils: any;
+    isTerminal: boolean;
     localPagination: boolean;
     tableWidth: number;
     currentDataSource: any[];

package/es/components/table/model.js

@@ -21,6 +21,7 @@ var defaultState = {
   quickFilter: [],
   otherFilter: [],
   utils: {},
+  isTerminal: false,
   setting: {
     field: {
       edit: 0
@@ -29,7 +30,7 @@ var defaultState = {
       edit: 0
     }
   },
-  tableWidth: 500,
+  tableWidth: 700,
   // 当前页展示的数据
   currentDataSource: [],
   // 经过一系列格式化之后的所有数据
@@ -83,6 +84,11 @@ var _getContext = getContext({
           utils: payload
         });
       },
+      setIsTerminal: function setIsTerminal(state, payload) {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          isTerminal: payload
+        });
+      },
       syncStorage: function syncStorage(state, payload) {
         return _objectSpread({}, state);
       },

package/es/hooks/useTranslationOriginal.js

@@ -1,9 +1,10 @@
 import useEngineContext from "./useEngineContext";
+import { isString } from "@pisell/utils";
 var useTranslationOriginal = function useTranslationOriginal() {
   var _context$appHelper, _context$appHelper$ut;
   var context = useEngineContext();
   return (context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.translationOriginal) || function (val) {
-    return val === null || val === void 0 ? void 0 : val.original;
+    return isString(val) ? val : val === null || val === void 0 ? void 0 : val.original;
   };
 };
 export default useTranslationOriginal;

package/lib/components/dataSourceComponents/dataSourceForm/utils.js

@@ -320,10 +320,10 @@ var withOptions = (WrappedComponent) => {
       if (optionSourceType !== "api") {
         return propsOptions;
       }
-      return ((_b = (_a2 = list.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.map((item) => ({
+      return (((_b = (_a2 = list.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.map((item) => ({
         label: translationOriginal(item[labelField]),
         value: item[valueField]
-      }))) || [];
+      }))) || []).sort((a, b) => a.label.localeCompare(b.label));
     }, [propsOptions, optionSourceType, (_a = list == null ? void 0 : list.data) == null ? void 0 : _a.data]);
     return /* @__PURE__ */ import_react.default.createElement(WrappedComponent, { ...props, options });
   };

package/lib/components/dataSourceComponents/dataSourceTable/filter/index.js

@@ -150,7 +150,8 @@ var Filter = (props) => {
         placeholder: search.placeholder,
         renderMode: "edit",
         prefix: /* @__PURE__ */ import_react.default.createElement(import_icons.SearchOutlined, null),
-        style: { width: 200, margin: 0 }
+        style: { width: 200, margin: 0 },
+        allowClear: true
       }
     ) : null;
   }, [search]);

package/lib/components/dataSourceComponents/dataSourceTable/filter/utils.js

@@ -78,6 +78,7 @@ var getCptProps = (field, cptType, item) => {
   props.allowClear = true;
   if (cptType === "FormItemSelect") {
     props.mode = "multiple";
+    props.showSearch = true;
   }
   if (["Select", "Radio.Group", "Checkbox.Group"].includes(
     (_b = field == null ? void 0 : field.uiSchema) == null ? void 0 : _b["x-component"]

package/lib/components/dataSourceComponents/fields/Translation/BaseTranslation.js

@@ -60,7 +60,7 @@ var Translation = ({
     if (!value) {
       return false;
     }
-    return Object.entries(value).some(([key, val]) => val);
+    return Object.entries(value).some(([key, val]) => key !== "original" && val);
   }, [value]);
   const handleInputChange = (0, import_react.useCallback)(
     (lang) => (e) => {

package/lib/components/dataSourceComponents/hooks/useActions.js

@@ -32,6 +32,7 @@ __export(useActions_exports, {
   default: () => useActions_default
 });
 module.exports = __toCommonJS(useActions_exports);
+var import_react = require("react");
 var import_ahooks = require("ahooks");
 var import_pisellToast = __toESM(require("../../pisellToast"));
 var import_useFormat = __toESM(require("../dataSourceTable/hooks/useFormat"));
@@ -64,8 +65,11 @@ var useActions = ({
     dataSourceKey: dataSourceKey || "",
     fields: fields || []
   });
+  const currentRecord = (0, import_react.useMemo)(() => {
+    return parseVariable == null ? void 0 : parseVariable(currentValue, {});
+  }, [currentValue, parseVariable]);
   const getParsedActions = (0, import_ahooks.useMemoizedFn)(() => {
-    return parseActions(originalActions, {});
+    return parseActions(originalActions, { currentRecord });
   });
   const genCustomApi = (0, import_ahooks.useMemoizedFn)(
     ({

package/lib/components/table/Table/index.js

@@ -57,7 +57,7 @@ var GridViewTable = ({
   const form = import_antd.Form.useFormInstance();
   const column_setting = import_antd.Form.useWatch("column_setting", { form, preserve: true }) || [];
   const tableWrapRef = (0, import_react.useRef)(null);
-  const { dataSource: defaultDataSource, originDataSource } = state;
+  const { dataSource: defaultDataSource, originDataSource, isTerminal } = state;
   const handleSave = (0, import_ahooks.useMemoizedFn)((row) => {
     const newData = [...defaultDataSource];
     const index = newData.findIndex((item2) => row.key === item2.key);
@@ -133,6 +133,7 @@ var GridViewTable = ({
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid-table-wrap", ref: tableWrapRef }, /* @__PURE__ */ import_react.default.createElement(
     AutoSizerContent,
     {
+      isTerminal,
       tableWrapRef,
       dataSource,
       tableProps,
@@ -150,7 +151,8 @@ var AutoSizerContent = (props) => {
     paginationConfig: paginationConfig2,
     columns,
     components,
-    tableWrapRef
+    tableWrapRef,
+    isTerminal
   } = props;
   const { height } = (0, import_ahooks.useSize)(tableWrapRef) || {};
   const debouncedHeight = (0, import_ahooks.useDebounce)(height, { wait: 500 });
@@ -168,28 +170,37 @@ var AutoSizerContent = (props) => {
     (_d = (_c = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c.pageSizeOptions) == null ? void 0 : _d[0]
   ]);
   const scroll = (0, import_useGenScroll.default)({
-    wrapHeight: debouncedHeight || 500,
+    wrapHeight: height || 500,
     scroll: tableProps.scroll,
     columns,
     isShowPagination
   });
   const debouncedScroll = (0, import_ahooks.useDebounce)(scroll, { wait: 200 });
+  const platformScroll = (0, import_react.useMemo)(() => {
+    if (isTerminal) {
+      return debouncedScroll;
+    }
+    return scroll;
+  }, [debouncedScroll, scroll, isTerminal]);
   const basicTable = (0, import_react.useMemo)(() => {
+    if (!height) {
+      return null;
+    }
     return /* @__PURE__ */ import_react.default.createElement(
       import_BasicTable.default,
       {
-        key: debouncedScroll,
         dataSource,
         columns,
         className: "grid-view-table",
         components,
         ...tableProps,
-        scroll: debouncedScroll,
+        scroll: platformScroll,
         pagination: paginationConfig2
       }
     );
   }, [
-    debouncedScroll,
+    height,
+    platformScroll,
     dataSource,
     columns,
     components,

package/lib/components/table/index.js

@@ -185,7 +185,11 @@ var GridView = (0, import_model.Provider)(
         type: "setUtils",
         payload: utils || {}
       });
-    }, [utils]);
+      modal.dispatch({
+        type: "setIsTerminal",
+        payload: isTerminal
+      });
+    }, [utils, isTerminal]);
     (0, import_react.useEffect)(() => {
       modal.dispatch({
         type: "setDefaultColumns",

package/lib/components/table/model.d.ts

@@ -12,6 +12,7 @@ interface FormState {
     quickFilter: FilterItemProps[];
     otherFilter: FilterItemProps[];
     utils: any;
+    isTerminal: boolean;
     localPagination: boolean;
     tableWidth: number;
     currentDataSource: any[];

package/lib/components/table/model.js

@@ -51,6 +51,7 @@ var defaultState = {
   quickFilter: [],
   otherFilter: [],
   utils: {},
+  isTerminal: false,
   setting: {
     field: {
       edit: 0
@@ -59,7 +60,7 @@ var defaultState = {
       edit: 0
     }
   },
-  tableWidth: 500,
+  tableWidth: 700,
   // 当前页展示的数据
   currentDataSource: [],
   // 经过一系列格式化之后的所有数据
@@ -101,6 +102,9 @@ var { Provider, Context } = (0, import_miniRedux.default)({
     setUtils(state, payload) {
       return { ...state, utils: payload };
     },
+    setIsTerminal(state, payload) {
+      return { ...state, isTerminal: payload };
+    },
     syncStorage(state, payload) {
       return { ...state };
     },

package/lib/hooks/useTranslationOriginal.js

@@ -33,9 +33,10 @@ __export(useTranslationOriginal_exports, {
 });
 module.exports = __toCommonJS(useTranslationOriginal_exports);
 var import_useEngineContext = __toESM(require("./useEngineContext"));
+var import_utils = require("@pisell/utils");
 var useTranslationOriginal = () => {
   var _a, _b;
   const context = (0, import_useEngineContext.default)();
-  return ((_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.translationOriginal) || ((val) => val == null ? void 0 : val.original);
+  return ((_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.translationOriginal) || ((val) => (0, import_utils.isString)(val) ? val : val == null ? void 0 : val.original);
 };
 var useTranslationOriginal_default = useTranslationOriginal;

package/lowcode/data-source-form/utils.ts

@@ -226,10 +226,10 @@ export const createFormItemSchema = (
       props.direction = 'horizontal';
     } else {
       props.styleType = 'antd';
+      props.showSearch = true;
+      props.isShowDropdown = true;
       if (props.mode === "multiple") {
         props.selectAll = true;
-        props.isShowDropdown = true;
-        props.showSearch = true;
       }
     }
     props.optionSourceType = 'default';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.504",
+  "version": "1.0.505",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",