@luck-design-biz/luckda 0.0.25-17 → 0.0.25-19

package/es/lowcode/view/lc-components/Table/index.js

@@ -1,21 +1,21 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useImperativeHandle, forwardRef, useEffect, useCallback } from 'react';
+import React, { useRef, useImperativeHandle, forwardRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { useMemoizedFn, useCreation, useSetState, useUpdateEffect, useRequest } from 'ahooks';
+import { useMemoizedFn, useCreation, useRequest, useUnmount } from 'ahooks';
 import { isNil, isString, keyBy } from 'lodash';
 import classNames from 'classnames';
 import { Modal, recheck } from '@luck-design-biz/base';
-import { useContext, useRemoteSource } from "../../../engine/provider/ContextProvider";
+import { useContext } from "../../../engine/provider/ContextProvider";
 import Wrapper from "../Wrapper";
 import { LdGrid, LDActions } from "../../../../index";
 import TopFilter from "./components/TopFilter";
 import { TopUpload, TopExport } from "./components/TopImex";
 import { omitBadProps, executeCode, getLDMetaAttr } from "../../../engine/tools/helper";
+import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
 import defaultMeta from "../../../engine/meta/table.props.default.json";
 import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT } from "../../../constants";
 import { exportExcel, getFindexcelstate } from "../../../constants/api-url";
@@ -58,31 +58,22 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     columnsReset = _ref.columnsReset,
     modelParams = _ref.modelParams,
     onGridReady = _ref.onGridReady,
-    advance = _ref.advance,
-    _ref$autoRowClick = _ref.autoRowClick,
-    autoRowClick = _ref$autoRowClick === void 0 ? true : _ref$autoRowClick;
+    advance = _ref.advance;
   var ctx = useContext();
   var apiRef = useRef();
   var wrapperRef = useRef();
-  var instanceRef = useRef();
-  var _useSetState = useSetState({}),
-    _useSetState2 = _slicedToArray(_useSetState, 2),
-    clickedRow = _useSetState2[0],
-    setClickedRow = _useSetState2[1];
+  var instanceRef = useCombinedRefs(ref);
   useImperativeHandle(apiRef, function () {
     return {
-      /**
-       * 获取表格实例
-       * @method
+      /**
+       * 获取表格实例
+       * @method
        */
       getInstance: function getInstance() {
         return instanceRef.current;
       }
     };
   });
-  useUpdateEffect(function () {
-    ctx.setPagePublicResource(_defineProperty({}, id, clickedRow));
-  }, [clickedRow]);
   var _pagination = useCreation(function () {
     return {
       isFlow: !pagination,
@@ -222,7 +213,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _onExportAll = useMemoizedFn(function (procress) {
     return new Promise( /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
-        var isBehavior, behaviorKey, strategy, _exportExcelParams, _exportExcelPrefix, exportExcelResponse, _ref4, _ref5, _getProps, apiUrl, _strategy, joiner, labels, fieldInfo, defaultExcelParams, _exportExcelParams2, _exportExcelPrefix2, _exportExcelResponse;
+        var isBehavior, behaviorKey, strategy, _exportExcelParams, _exportExcelPrefix, exportExcelResponse, _instanceRef$current, _instanceRef$current2, _instanceRef$current$, apiUrl, _strategy, joiner, labels, fieldInfo, defaultExcelParams, _exportExcelParams2, _exportExcelPrefix2, _exportExcelResponse;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -257,12 +248,12 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
               _context.next = 25;
               break;
             case 12:
-              _getProps = (_ref4 = (instanceRef === null || instanceRef === void 0 ? void 0 : instanceRef.current) || (ref === null || ref === void 0 ? void 0 : ref.current)) === null || _ref4 === void 0 ? void 0 : _ref4.getProps(), apiUrl = _getProps.apiUrl;
+              _instanceRef$current$ = (_instanceRef$current = instanceRef.current) === null || _instanceRef$current === void 0 ? void 0 : _instanceRef$current.getProps(), apiUrl = _instanceRef$current$.apiUrl;
               _strategy = 'report_server';
               joiner = apiUrl.indexOf('?') !== -1 ? '&' : '?';
               labels = [];
               fieldInfo = [];
-              (_ref5 = (instanceRef === null || instanceRef === void 0 ? void 0 : instanceRef.current) || (ref === null || ref === void 0 ? void 0 : ref.current)) === null || _ref5 === void 0 || (_ref5 = _ref5.gridApi) === null || _ref5 === void 0 || _ref5.columnApi.getAllDisplayedColumns().forEach(function (column) {
+              (_instanceRef$current2 = instanceRef.current) === null || _instanceRef$current2 === void 0 || (_instanceRef$current2 = _instanceRef$current2.gridApi) === null || _instanceRef$current2 === void 0 || _instanceRef$current2.columnApi.getAllDisplayedColumns().forEach(function (column) {
                 if (column.colId !== 'luck-expand' && column.colId !== 'luck-select' && column.colId !== 'luck-index' && column.colId !== 'luck-actions' && column.colId !== 'fraction_drag'
                 // && !column.colDef.draggable
                 ) {
@@ -316,8 +307,8 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
       enableExportAll: !!impexp.export
     };
     if (!!impexp.export) {
-      var _ref6;
-      var _tableProps = (_ref6 = (instanceRef === null || instanceRef === void 0 ? void 0 : instanceRef.current) || (ref === null || ref === void 0 ? void 0 : ref.current)) === null || _ref6 === void 0 ? void 0 : _ref6.getProps();
+      var _instanceRef$current3;
+      var _tableProps = (_instanceRef$current3 = instanceRef.current) === null || _instanceRef$current3 === void 0 ? void 0 : _instanceRef$current3.getProps();
       _temp.apiUrl = _tableProps === null || _tableProps === void 0 ? void 0 : _tableProps.apiUrl;
       _temp.onExportAll = _onExportAll;
     }
@@ -384,31 +375,32 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
       resultComp.push( /*#__PURE__*/React.createElement(LDActions, _extends({}, topActionGroup, {
         doAction: function doAction(action) {
           return ctx.doAction(action, {
+            instance: instanceRef.current,
             datasetCode: dataset.code
           });
         }
       })));
     }
     if (impexp.import) {
-      var _ref7;
-      var _getProps2 = (_ref7 = instanceRef.current || ref.current) === null || _ref7 === void 0 ? void 0 : _ref7.getProps(),
-        apiUrl = _getProps2.apiUrl;
+      var _instanceRef$current4;
+      var _instanceRef$current$2 = (_instanceRef$current4 = instanceRef.current) === null || _instanceRef$current4 === void 0 ? void 0 : _instanceRef$current4.getProps(),
+        apiUrl = _instanceRef$current$2.apiUrl;
       resultComp.push( /*#__PURE__*/React.createElement(TopUpload, {
         apiUrl: apiUrl,
         moduleCode: moduleCode,
         options: impexp,
-        tableRef: instanceRef.current || ref.current
+        tableRef: instanceRef
       }));
     }
     if (isString(impexp.export) || impexp.export) {
-      var _ref8;
-      var _getProps3 = (_ref8 = instanceRef.current || ref.current) === null || _ref8 === void 0 ? void 0 : _ref8.getProps(),
-        _apiUrl = _getProps3.apiUrl;
+      var _instanceRef$current5;
+      var _instanceRef$current$3 = (_instanceRef$current5 = instanceRef.current) === null || _instanceRef$current5 === void 0 ? void 0 : _instanceRef$current5.getProps(),
+        _apiUrl = _instanceRef$current$3.apiUrl;
       resultComp.push( /*#__PURE__*/React.createElement(TopExport, {
         apiUrl: _apiUrl,
         moduleCode: moduleCode,
         options: impexp,
-        tableRef: instanceRef.current || ref.current
+        tableRef: instanceRef
       }));
     }
     return resultComp;
@@ -434,7 +426,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   });
   var _readFilter = useMemoizedFn(function (params, filters) {
-    return setClickedRow({
+    ctx.doAction(advance.events.onFilterChanged, {
       params: params,
       filters: filters
     });
@@ -447,8 +439,9 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     });
   });
   var _handleRowClick = useMemoizedFn(function (data, rowIndex, params) {
-    setClickedRow({
-      clickedRow: data
+    instanceRef.current.expectRowKey = data[PRIMARY_KEY];
+    ctx.doAction(advance.events.onExpectRowChanged, {
+      data: data
     });
     ctx.doAction(advance.events.onRowClick, {
       data: data,
@@ -503,27 +496,21 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     });
   });
   var _afterQuery = useMemoizedFn(function (res) {
+    if (res.code === 1 && !res.list.includes(instanceRef.current.expectRowKey)) {
+      instanceRef.current.expectRowKey = res.list[0];
+      ctx.doAction(advance.events.onExpectRowChanged, {
+        data: res.detail[res.list[0]]
+      });
+    }
     ctx.doAction(advance.events.afterQuery, {
       res: res,
       datasetCode: dataset.code
     });
   });
-  useEffect(function () {
-    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref10) {
-      var resource = _ref10.resource,
-        prevResource = _ref10.prevResource;
-      ctx.doAction(advance.events.onPagePublicResourceChanged, {
-        resource: resource,
-        prevResource: prevResource,
-        instance: (ref === null || ref === void 0 ? void 0 : ref.current) || (instanceRef === null || instanceRef === void 0 ? void 0 : instanceRef.current)
-      });
-    }).watch();
-    return function () {
-      ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
-      ctx.doAction(advance.events.onUnmount, {
-        datasetCode: dataset === null || dataset === void 0 ? void 0 : dataset.code
-      });
-    };
+  useUnmount(function () {
+    return ctx.doAction(advance.events.onUnmount, {
+      datasetCode: dataset === null || dataset === void 0 ? void 0 : dataset.code
+    });
   }, []);
   var getTargetDom = useMemoizedFn(function () {
     return wrapperRef.current;
@@ -534,7 +521,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     getTargetDom: getTargetDom,
     api: apiRef
   }, /*#__PURE__*/React.createElement(LdGrid, _extends({
-    ref: ref || instanceRef,
+    ref: instanceRef,
     wrapper: wrapperRef,
     wrapperProps: _wrapperProps,
     width: width,
@@ -559,140 +546,139 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onRowDoubleClick: _handleRowDoubleClick,
     onRowDragged: _handleRowDragged,
     afterInit: _afterInit,
-    afterQuery: _afterQuery,
-    autoRowClick: autoRowClick
+    afterQuery: _afterQuery
   })));
 });
 LCTable.propTypes = {
-  /**
-   * @name 唯一标识
-   * @type string
-   * @disabled true
+  /**
+   * @name 唯一标识
+   * @type string
+   * @disabled true
    */
   id: PropTypes.string.isRequired,
-  /**
-   * @name 数据集
-   * @type _DataSetSelector
+  /**
+   * @name 数据集
+   * @type _DataSetSelector
    */
   dataset: PropTypes.shape({
     code: PropTypes.string.isRequired,
     uid: PropTypes.string.isRequired
   }),
-  /**
-   * @name 自动加载
-   * @desc 首次数据是否自动加载，若存在必须带搜索条件再加载的情况，需要关闭
-   * @type switch
-   * @default true
+  /**
+   * @name 自动加载
+   * @desc 首次数据是否自动加载，若存在必须带搜索条件再加载的情况，需要关闭
+   * @type switch
+   * @default true
    */
   autoLoad: PropTypes.bool,
-  /**
-   * @name 只读
-   * @type switch
-   * @default false
+  /**
+   * @name 只读
+   * @type switch
+   * @default false
    */
   readOnly: PropTypes.bool,
-  /**
-   * @name 关闭预设
-   * @type switch
-   * @default false
+  /**
+   * @name 关闭预设
+   * @type switch
+   * @default false
    */
   suppressPreset: PropTypes.bool,
-  /**
-   * @name 宽度
-   * @type _WidthHeight
-   * @default 100%
-   * @group styleSetting
+  /**
+   * @name 宽度
+   * @type _WidthHeight
+   * @default 100%
+   * @group styleSetting
    */
   width: PropTypes.string,
-  /**
-   * @name 高度
-   * @type _WidthHeight
-   * @default 100%
-   * @group styleSetting
+  /**
+   * @name 高度
+   * @type _WidthHeight
+   * @default 100%
+   * @group styleSetting
    */
   height: PropTypes.string,
-  /**
-   * @name 边框线
-   * @type switch
-   * @default false
-   * @group styleSetting
+  /**
+   * @name 边框线
+   * @type switch
+   * @default false
+   * @group styleSetting
    */
   border: PropTypes.bool,
-  /**
-   * @name 斑马纹
-   * @type switch
-   * @default false
-   * @group styleSetting
+  /**
+   * @name 斑马纹
+   * @type switch
+   * @default false
+   * @group styleSetting
    */
   zebra: PropTypes.oneOfType[(PropTypes.bool, PropTypes.string)],
-  /**
-   * @name 开启分页
-   * @type switch
-   * @default true
-   * @group paginationSetting
+  /**
+   * @name 开启分页
+   * @type switch
+   * @default true
+   * @group paginationSetting
    */
   pagination: PropTypes.bool,
-  /**
-   * @name 每页条数
-   * @type number
-   * @default 30
-   * @group paginationSetting
+  /**
+   * @name 每页条数
+   * @type number
+   * @default 30
+   * @group paginationSetting
    */
   pageSize: PropTypes.number,
-  /**
-   * @name 分页器
-   * @type switch
-   * @default true
-   * @group paginationSetting
+  /**
+   * @name 分页器
+   * @type switch
+   * @default true
+   * @group paginationSetting
    */
   showSizeChanger: PropTypes.bool,
-  /**
-   * @name 快速跳转
-   * @type switch
-   * @default true
-   * @group paginationSetting
+  /**
+   * @name 快速跳转
+   * @type switch
+   * @default true
+   * @group paginationSetting
    */
   showQuickJumper: PropTypes.bool,
-  /**
-   * @name 单页无分页器
-   * @type switch
-   * @default false
-   * @group paginationSetting
+  /**
+   * @name 单页无分页器
+   * @type switch
+   * @default false
+   * @group paginationSetting
    */
   hideOnSinglePage: PropTypes.bool,
-  /**
-   * @name 简单模式
-   * @type switch
-   * @default false
-   * @group paginationSetting
+  /**
+   * @name 简单模式
+   * @type switch
+   * @default false
+   * @group paginationSetting
    */
   paginationSimple: PropTypes.bool,
-  /**
-   * @name 隐藏操作列
-   * @type switch
-   * @default false
-   * @groupNext actionsColumn
+  /**
+   * @name 隐藏操作列
+   * @type switch
+   * @default false
+   * @groupNext actionsColumn
    */
   suppressActions: PropTypes.bool,
-  /**
-   * @name 隐藏操作列
-   * @type number
-   * @default 160
-   * @groupNext actionsColumn
+  /**
+   * @name 隐藏操作列
+   * @type number
+   * @default 160
+   * @groupNext actionsColumn
    */
   actionsColumnWidth: PropTypes.number,
-  /**
-   * @name 最大显示数
-   * @type number
-   * @default 2
-   * @groupNext actionsColumn
+  /**
+   * @name 最大显示数
+   * @type number
+   * @default 2
+   * @groupNext actionsColumn
    */
   maxActionsCount: PropTypes.number,
-  /**
-   * @name 操作项
-   * @type _TableActions
-   * @groupNext actionsColumn
-   * @default {"display": "text", "max": 2, "moreText": "更多行为", "todoList": []}
+  /**
+   * @name 操作项
+   * @type _TableActions
+   * @groupNext actionsColumn
+   * @default {"display": "text", "max": 2, "moreText": "更多行为", "todoList": []}
    */
   actions: PropTypes.shape({
     display: PropTypes.oneOf(['text', 'button']),
@@ -700,10 +686,10 @@ LCTable.propTypes = {
     moreText: PropTypes.string,
     todoList: PropTypes.array
   }),
-  /**
-   * @name 顶部操作
-   * @type _ActionGroup
-   * @default {"display": "button", "max": 2, "moreText": "操作", "todoList": []}
+  /**
+   * @name 顶部操作
+   * @type _ActionGroup
+   * @default {"display": "button", "max": 2, "moreText": "操作", "todoList": []}
    */
   topActionGroup: PropTypes.shape({
     display: PropTypes.oneOf(['text', 'button']),
@@ -711,86 +697,86 @@ LCTable.propTypes = {
     moreText: PropTypes.string,
     todoList: PropTypes.array
   }),
-  /**
-   * @name 顶部过滤器
-   * @type _TableTopFilter
+  /**
+   * @name 顶部过滤器
+   * @type _TableTopFilter
    */
   topFilter: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.shape({
     options: PropTypes.array.isRequired,
     field: PropTypes.string.isRequired
   })]),
-  /**
-   * @name 开启行选择器
-   * @type boolean
-   * @default false
+  /**
+   * @name 开启行选择器
+   * @type boolean
+   * @default false
    */
   rowSelection: PropTypes.bool,
-  /**
-   * @name 停用分页多选
-   * @type boolean
-   * @default false
+  /**
+   * @name 停用分页多选
+   * @type boolean
+   * @default false
    */
   suppressRowSelectionPagination: PropTypes.bool,
-  /**
-   * @name 选择器模式
-   * @type segmented
-   * @options [{label: '复选', value: 'multiple'}, {label: '单选', value: 'single'}]
-   * @default 'multiple'
+  /**
+   * @name 选择器模式
+   * @type segmented
+   * @options [{label: '复选', value: 'multiple'}, {label: '单选', value: 'single'}]
+   * @default 'multiple'
    */
   rowSelectionMode: PropTypes.oneOf(['single', 'multiple']),
-  /**
-   * @name 默认选中
-   * @type _JSEditor
-   * @default "function getDefaultRowSelected(data, node, ctx) { \n return false; \n}"
+  /**
+   * @name 默认选中
+   * @type _JSEditor
+   * @default "function getDefaultRowSelected(data, node, ctx) { \n return false; \n}"
    */
   defaultRowSelectedCode: PropTypes.string,
-  /**
-   * @name 行是否可选
-   * @type _JSEditor
-   * @default "function getRowSelectable(data, node, ctx) { \n return true; \n}"
+  /**
+   * @name 行是否可选
+   * @type _JSEditor
+   * @default "function getRowSelectable(data, node, ctx) { \n return true; \n}"
    */
   rowSelectableCode: PropTypes.string,
-  /**
-   * @name 导入导出
-   * @type _ImpExp
-   * @default { "export": true }
+  /**
+   * @name 导入导出
+   * @type _ImpExp
+   * @default { "export": true }
    */
   impexp: PropTypes.shape({
     import: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
     importType: PropTypes.bool,
     export: PropTypes.oneOfType([PropTypes.bool, PropTypes.string])
   }),
-  /**
-   * @name 批量操作
-   * @type _BatchActions
-   * @default { "todoList": [] }
+  /**
+   * @name 批量操作
+   * @type _BatchActions
+   * @default { "todoList": [] }
    */
   bantchActions: PropTypes.shape({
     todoList: PropTypes.array
   }),
-  /**
-   * @name 格式化数据
-   * @type _JSEditor
+  /**
+   * @name 格式化数据
+   * @type _JSEditor
    */
   formatDataSource: PropTypes.string,
-  /**
-   * @name 构建树层级
-   * @type _JSEditor
+  /**
+   * @name 构建树层级
+   * @type _JSEditor
    */
   getDataPath: PropTypes.string,
-  /**
-   * @name 重写表格列
-   * @type _JSEditor
+  /**
+   * @name 重写表格列
+   * @type _JSEditor
    */
   columnsRewrite: PropTypes.string,
-  /**
-   * @name 重置表格列
-   * @type _JSEditor
+  /**
+   * @name 重置表格列
+   * @type _JSEditor
    */
   columnsReset: PropTypes.string,
-  /**
-   * @name model参数
-   * @type _JSEditor
+  /**
+   * @name model参数
+   * @type _JSEditor
    */
   modelParams: PropTypes.string
 };

package/es/lowcode/view/lc-components/Table/meta.json

@@ -423,10 +423,16 @@
         "func": "function onRowDragged(toId, fromId, params) {\n\t\n}"
       },
       {
-        "key": "onPagePublicResourceChanged",
-        "name": "页面共享资源变化后",
-        "desc": "当页面共享资源发生变化后（pagePublicResourceChanged），执行方法",
-        "func": "function onPagePublicResourceChanged(resource, prevResource, instance) {\n\t\n}"
+        "key": "onExpectRowChanged",
+        "name": "期望行变化后",
+        "desc": "表格的期望行发生变化后，执行方法",
+        "func": "function onExpectRowChanged(data) {\n\t\n}"
+      },
+      {
+        "key": "onFilterChanged",
+        "name": "表格过滤条件变化后",
+        "desc": "表格过滤条件变化后，执行方法",
+        "func": "function onFilterChanged(params, filters) {\n\t\n}"
       },
       {
         "key": "afterInit",

package/es/lowcode/view/lc-components/Tree/index.js

@@ -60,20 +60,6 @@ var LCTree = function LCTree(_ref) {
       }
     };
   });
-  useEffect(function () {
-    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref2) {
-      var resource = _ref2.resource,
-        prevResource = _ref2.prevResource;
-      ctx.doAction(advance.events.onPagePublicResourceChanged, {
-        resource: resource,
-        prevResource: prevResource,
-        instance: treeRef.current
-      });
-    }).watch();
-    return function () {
-      ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
-    };
-  }, []);
   var handleMount = useMemoizedFn(function (params) {
     ctx.doAction(advance.events.onMount, {
       params: params
@@ -121,12 +107,6 @@ var LCTree = function LCTree(_ref) {
   var handleSelect = useMemoizedFn(function (_selectedKeys, e) {
     if (cancelSelect || e.selected) {
       setSelectedKeys(_selectedKeys);
-      ctx.setPagePublicResource(_defineProperty({}, id, {
-        selectedNodes: e.selectedNodes.map(function (i) {
-          var _i$props;
-          return (i === null || i === void 0 || (_i$props = i.props) === null || _i$props === void 0 ? void 0 : _i$props.dataRef) || i;
-        })
-      }));
     }
     ctx.doAction(advance.events.onSelect, {
       checkedKeys: _selectedKeys,