@luck-design-biz/luckda 1.0.2-2 → 1.0.2-20

package/lib/components/ComplexItem/service.js

@@ -11,18 +11,21 @@ var _qs = require("qs");
 var _utils = require("@luck-design-biz/base/utils");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var fetchContent = exports.fetchContent = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(dmCode, get) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(dmCode, get, post) {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat((0, _qs.stringify)(get))));
+          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat((0, _qs.stringify)(get)), {
+            method: 'POST',
+            body: post
+          }));
         case 1:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function fetchContent(_x, _x2) {
+  return function fetchContent(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();

package/lib/components/LDActions/index.js

@@ -36,6 +36,7 @@ var DisplayComp = function DisplayComp(_ref) {
   return /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _extends2.default)({}, props, {
     disabled: action.serialEffect === 'disable',
     className: (0, _classnames.default)(_index.default[action.riskLevel], (0, _defineProperty2.default)({}, className, !!className)),
+    type: action.riskLevel,
     onClick: onClick
   }), children);
 };

package/lib/components/LdAutoForm/index.js

@@ -17,7 +17,7 @@ var _FormList = require("@luck-design-biz/base/FormList");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _Builder = require("../Builder");
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules", "pageProxy"];
 var didMount = false;
 var debounceFunc = (0, _lodash.debounce)(function (fields, changedValues, allValues, props) {
   (0, _lodash.forEach)(changedValues, function (val, key) {
@@ -65,8 +65,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     _ref$fields = _ref.fields,
     fields = _ref$fields === void 0 ? [] : _ref$fields,
     setVerifyRules = _ref.setVerifyRules,
+    pageProxy = _ref.pageProxy,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+  var _ref2 = (0, _Builder.useLDCtx)(pageProxy) || {},
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = /*#__PURE__*/(0, _react.createRef)({});
   var isMain = ldId === mainFormLdId;

package/lib/components/LdCard/index.js

@@ -112,11 +112,13 @@ var LdCard = function LdCard(_ref2) {
           }
         };
       },
-      onLdQuery: function onLdQuery() {
-        var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        doQuery({
+      onLdQuery: function onLdQuery(_params) {
+        var _getDvaApp2;
+        if (_params) doQuery({
           params: _params,
           callback: afterInit
+        });else (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2._store.dispatch({
+          type: "".concat(namespace, "/doQuery")
         });
       }
     });
@@ -228,11 +230,11 @@ var LdIndex = function LdIndex(_ref4) {
     label: '此数据集为树形数据集，请选择非树形数据集'
   });
   var Component = (0, _ahooks.useCreation)(function () {
-    var _getDvaApp2, _getDvaApp3;
-    (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
-    if (!((_getDvaApp3 = (0, _umi.getDvaApp)()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
-      var _getDvaApp4;
-      (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    var _getDvaApp3, _getDvaApp4;
+    (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.unmodel(namespace);
+    if (!((_getDvaApp4 = (0, _umi.getDvaApp)()) !== null && _getDvaApp4 !== void 0 && _getDvaApp4._store.getState()[namespace])) {
+      var _getDvaApp5;
+      (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 || _getDvaApp5.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         isFlow: !!props.isFlow
       }, overModel), {}, {
         dataSetKey: props.dataSetKey,

package/lib/components/LdCom/index.js

@@ -12,15 +12,16 @@ var _antd = require("luck-design/antd");
 var _base = require("@luck-design-biz/base");
 var _IconFont = _interopRequireDefault(require("../IconFont"));
 var _ldComBuild = require("../../helper/ldComBuild");
-var _excluded = ["options"];
+var _excluded = ["options", "pageProxy"];
 var LdButton = exports.LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
 var LdCollapse = exports.LdCollapse = (0, _ldComBuild.ldComBuilder)(_base.Collapse);
 var LdButtonRadio = exports.LdButtonRadio = function LdButtonRadio(_ref) {
   var _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
+    pageProxy = _ref.pageProxy,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_base.ButtonRadio, (0, _extends2.default)({}, props, {
-    options: (0, _ldComBuild.filterOptions)(options)
+    options: (0, _ldComBuild.filterOptions)(options, pageProxy)
   }));
 };
 var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_IconFont.default);

package/lib/components/LdFormList/index.js

@@ -31,7 +31,7 @@ var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
 var _utils2 = require("../../lowcode/engine/provider/ContextProvider/utils");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "showConfigBtn", "affixBarZIndex"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "pageProxy", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "validateErrorCallback", "showConfigBtn", "affixBarZIndex"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -45,6 +45,7 @@ var LdFormList = function LdFormList(_ref) {
     loading = _ref.loading,
     apiRef = _ref.apiRef,
     wrapperRef = _ref.wrapperRef,
+    pageProxy = _ref.pageProxy,
     readOnly = _ref.readOnly,
     mainFormLdId = _ref.mainFormLdId,
     renderFormList = _ref.renderFormList,
@@ -66,6 +67,7 @@ var LdFormList = function LdFormList(_ref) {
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
     afterSubmitLoading = _ref.afterSubmitLoading,
+    validateErrorCallback = _ref.validateErrorCallback,
     _ref$showConfigBtn = _ref.showConfigBtn,
     showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
     affixBarZIndex = _ref.affixBarZIndex,
@@ -89,7 +91,7 @@ var LdFormList = function LdFormList(_ref) {
   }, []);
   var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
-  var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+  var _ref3 = (0, _Builder.useLDCtx)(pageProxy) || {},
     dataSets = _ref3.dataSets,
     doAction = _ref3.doAction,
     resources = _ref3.resources,
@@ -228,9 +230,9 @@ var LdFormList = function LdFormList(_ref) {
       formUid: formUid,
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
-      afterSubmitLoading && afterSubmitLoading(res);
       setSubmitLoading(false);
       if (success) {
+        afterSubmitLoading === null || afterSubmitLoading === void 0 || afterSubmitLoading(res);
         var mainFormData = res.detail[res.list[0]];
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
@@ -238,10 +240,11 @@ var LdFormList = function LdFormList(_ref) {
           var _formListRef$current, _formListRef$current2;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
           (_formListRef$current2 = formListRef.current) === null || _formListRef$current2 === void 0 || _formListRef$current2.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
-            formListRef.current.setFormMode('info');
+            var _formListRef$current4;
+            (_formListRef$current4 = formListRef.current) === null || _formListRef$current4 === void 0 || _formListRef$current4.setFormMode('info');
           });
         }
-      }
+      } else validateErrorCallback === null || validateErrorCallback === void 0 || validateErrorCallback();
     });
   };
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -297,7 +300,7 @@ var LdFormList = function LdFormList(_ref) {
     getContainer: getContainer
   }), (0, _lodash.sortBy)([].concat((0, _toConsumableArray2.default)(formList), (0, _toConsumableArray2.default)(formExtra)), function (o) {
     var _o$props;
-    return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
+    return (o === null || o === void 0 ? void 0 : o.order) || (o === null || o === void 0 || (_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
     var _formProps$type = formProps.type,
       type = _formProps$type === void 0 ? 'auto' : _formProps$type;

package/lib/components/LdGrid/index.js

@@ -85,10 +85,12 @@ var LdGrid = function LdGrid(_ref) {
           }
         };
       },
-      onLdQuery: function onLdQuery() {
-        var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        doQuery({
+      onLdQuery: function onLdQuery(_params) {
+        var _getDvaApp2;
+        if (_params) doQuery({
           params: _params
+        });else (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2._store.dispatch({
+          type: "".concat(namespace, "/doQuery")
         });
       }
     });
@@ -108,7 +110,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) {
-      if (_lodash.isFunction) {
+      if ((0, _lodash.isFunction)(columnsReset)) {
         return columnsReset(columns);
       }
       return columnsReset;
@@ -152,9 +154,6 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
-
-  // console.log('_columns',columns,_columns)
-
   return /*#__PURE__*/_react.default.createElement(_List.GridList, (0, _extends2.default)({
     columns: _columns
     // 资源串、行为配置
@@ -192,11 +191,11 @@ var LdIndex = function LdIndex(_ref2) {
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   var isTreeGrid = (0, _lodash.isNil)(_isTreeGrid) ? (0, _lodash.includes)(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = (0, _ahooks.useCreation)(function () {
-    var _getDvaApp2, _getDvaApp3;
-    (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
-    if (!((_getDvaApp3 = (0, _umi.getDvaApp)()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
-      var _getDvaApp4, _props$pagination;
-      (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    var _getDvaApp3, _getDvaApp4;
+    (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.unmodel(namespace);
+    if (!((_getDvaApp4 = (0, _umi.getDvaApp)()) !== null && _getDvaApp4 !== void 0 && _getDvaApp4._store.getState()[namespace])) {
+      var _getDvaApp5, _props$pagination;
+      (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 || _getDvaApp5.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
       }, overModel), {}, {
         pageSize: overModel.pageSize || ((_props$pagination = props.pagination) === null || _props$pagination === void 0 ? void 0 : _props$pagination.pageSize) || props.pageSize,

package/lib/components/LdGridForm/index.js

@@ -19,7 +19,7 @@ var _utils = require("../../utils");
 var _form = require("../../helper/form");
 var _Builder = require("../Builder");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules", "pageProxy"];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -61,8 +61,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     formMode = _ref.formMode,
     fields = _ref.fields,
     setVerifyRules = _ref.setVerifyRules,
+    pageProxy = _ref.pageProxy,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+  var _ref2 = (0, _Builder.useLDCtx)(pageProxy) || {},
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = /*#__PURE__*/(0, _react.createRef)({});
   var isMain = ldId === mainFormLdId;

package/lib/helper/FromItems.js

@@ -26,7 +26,7 @@ var _excluded = ["onBlur"],
   _excluded4 = ["handleValueChange", "config"],
   _excluded5 = ["onBlur"],
   _excluded6 = ["handleValueChange", "config"],
-  _excluded7 = ["onChange"],
+  _excluded7 = ["onChange", "format"],
   _excluded8 = ["handleValueChange", "config"],
   _excluded9 = ["handleValueChange", "onChange", "params", "extraFilter"],
   _excluded10 = ["onChange"],
@@ -35,7 +35,7 @@ var _excluded = ["onBlur"],
   _excluded13 = ["handleValueChange", "config", "allowClear"],
   _excluded14 = ["renderInfoMode"],
   _excluded15 = ["onChange"],
-  _excluded16 = ["handleValueChange", "config", "selectorProps", "suppressSelect"],
+  _excluded16 = ["handleValueChange", "config", "selectorProps", "suppressSelect", "auth", "leafOnly"],
   _excluded17 = ["onClose"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["onChange"],
@@ -48,6 +48,60 @@ var _excluded = ["onBlur"],
   _excluded26 = ["handleValueChange", "config"],
   _excluded27 = ["onChange"],
   _excluded28 = ["handleValueChange", "config"];
+var data_config = {
+  'YYYY-MM-DD HH:mm:ss': {
+    type: 'date',
+    showTime: {
+      format: 'HH:mm:ss'
+    }
+  },
+  'YYYY-MM-DD HH:mm': {
+    type: 'date',
+    showTime: {
+      format: 'HH:mm'
+    }
+  },
+  'YYYY-MM-DD HH': {
+    type: 'date',
+    showTime: {
+      format: 'HH'
+    }
+  },
+  'YYYY-MM-DD': {
+    type: 'date',
+    showTime: false
+  },
+  'YYYY-MM': {
+    type: 'month',
+    showTime: false
+  },
+  'YYYY-wo': {
+    type: 'week',
+    showTime: false
+  },
+  'YYYY': {
+    type: 'year',
+    showTime: false
+  },
+  'HH:mm:ss': {
+    type: 'time',
+    showTime: {
+      format: 'HH:mm:ss'
+    }
+  },
+  'HH:mm': {
+    type: 'time',
+    showTime: {
+      format: 'HH:mm'
+    }
+  },
+  'mm:ss': {
+    type: 'time',
+    showTime: {
+      format: 'mm:ss'
+    }
+  }
+};
 var getNumberItem = exports.getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
@@ -112,13 +166,14 @@ var getDateItem = exports.getDateItem = function getDateItem() {
     _ref7$config = _ref7.config,
     _ref7$config2 = _ref7$config === void 0 ? {} : _ref7$config,
     _onChange = _ref7$config2.onChange,
+    format = _ref7$config2.format,
     _config = (0, _objectWithoutProperties2.default)(_ref7$config2, _excluded7),
     props = (0, _objectWithoutProperties2.default)(_ref7, _excluded8);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
     $attrs: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.LC_COMPONENT_UNIT_KEY, _constants.LC_FORMITEM_UNIT), 'data-__component', 'FieldDate'),
     type: "datePicker",
-    config: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config), {}, {
-      type: 'date',
+    config: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, data_config[format]), _config), {}, {
+      format: format,
       onChange: function onChange(date, dateString) {
         handleValueChange && handleValueChange(date);
         _onChange && _onChange(date, dateString);
@@ -243,10 +298,14 @@ var getGroupItem = exports.getGroupItem = function getGroupItem(_ref19) {
     _ref19$selectorProps = _ref19.selectorProps,
     selectorProps = _ref19$selectorProps === void 0 ? {} : _ref19$selectorProps,
     suppressSelect = _ref19.suppressSelect,
+    _ref19$auth = _ref19.auth,
+    auth = _ref19$auth === void 0 ? false : _ref19$auth,
+    _ref19$leafOnly = _ref19.leafOnly,
+    leafOnly = _ref19$leafOnly === void 0 ? false : _ref19$leafOnly,
     props = (0, _objectWithoutProperties2.default)(_ref19, _excluded16);
   return /*#__PURE__*/_react.default.createElement(_base.TreeSelector, (0, _extends2.default)({}, props, {
     $attrs: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.LC_COMPONENT_UNIT_KEY, _constants.LC_FORMITEM_UNIT), 'data-__component', 'FieldGroup'),
-    api: "/api/base/group/sysGroupTree/noAuthReadJurisTree?sclassKey=".concat(props.sclassKey),
+    api: "/api/base/group/sysGroupTree/".concat(auth ? 'noAuthReadJurisTree' : 'noAuthReadNoJurisTree', "?sclassKey=").concat(props.sclassKey, "&ex=").concat(escape(leafOnly ? 'ichildren!=0' : '')),
     selectorProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectorProps), {}, {
       suppressSelect: suppressSelect
     }),

package/lib/helper/action.js

@@ -188,5 +188,7 @@ var onBatchSubmitAction = exports.onBatchSubmitAction = function onBatchSubmitAc
         callback: callback
       });
     }
+  }).catch(function () {
+    callback(false);
   });
 };

package/lib/helper/ldBuilder.js

@@ -1,13 +1,12 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ErrorWrapper = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _Builder = require("../components/Builder");
 var _utils = require("@luck-design-biz/base/utils");
@@ -21,8 +20,9 @@ var builder = function builder(wrapped) {
       dataSetKey = props.dataSetKey,
       wrapper = props.wrapper,
       className = props.className,
-      style = props.style;
-    var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+      style = props.style,
+      pageProxy = props.pageProxy;
+    var _ref = (0, _Builder.useLDCtx)(pageProxy) || {},
       resources = _ref.resources,
       actions = _ref.actions,
       _ref$dataSets = _ref.dataSets,

package/lib/helper/ldComBuild.js

@@ -16,10 +16,10 @@ var _utils = require("@luck-design-biz/base/utils");
 var _Builder = require("../components/Builder");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["$css"],
-  _excluded2 = ["className", "$css"];
-var getResources = exports.getResources = function getResources() {
-  var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+var _excluded = ["$css", "pageProxy"],
+  _excluded2 = ["className", "$css", "pageProxy"];
+var getResources = exports.getResources = function getResources(pageProxy) {
+  var _ref = (0, _Builder.useLDCtx)(pageProxy) || {},
     _ref$resources = _ref.resources,
     resources = _ref$resources === void 0 ? [] : _ref$resources;
   return resources;
@@ -27,26 +27,29 @@ var getResources = exports.getResources = function getResources() {
 var ldComBuilder = exports.ldComBuilder = function ldComBuilder(Com) {
   var Component = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     var $css = _ref2.$css,
+      pageProxy = _ref2.pageProxy,
       props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
-    var resources = getResources();
+    var resources = getResources(pageProxy);
     var hasResources = (0, _ahooks.useCreation)(function () {
       return (0, _lodash.isNil)(props === null || props === void 0 ? void 0 : props.resource) || (0, _lodash.includes)(resources, props.resource);
     }, [props === null || props === void 0 ? void 0 : props.resource, resources]);
     if (hasResources) {
       return /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
+        pageProxy: pageProxy,
         ref: ref
       }));
     }
     return props.serialEffect === 'hidden' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null) : /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
       disabled: true,
+      pageProxy: pageProxy,
       ref: ref
     }));
   });
   return Component;
 };
-var filterOptions = exports.filterOptions = function filterOptions(options) {
-  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'resource';
-  var resources = getResources();
+var filterOptions = exports.filterOptions = function filterOptions(options, pageProxy) {
+  var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'resource';
+  var resources = getResources(pageProxy);
   return (0, _lodash.intersectionWith)(options, resources, function (arrVal, othVal) {
     return !arrVal[key] || arrVal[key] === othVal;
   });
@@ -55,9 +58,11 @@ var deepFilterCom = exports.deepFilterCom = function deepFilterCom(Com, childMar
   var Component = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     var className = _ref3.className,
       $css = _ref3.$css,
+      pageProxy = _ref3.pageProxy,
       props = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
-    var resources = getResources();
+    var resources = getResources(pageProxy);
     var com = /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
+      pageProxy: pageProxy,
       className: (0, _classnames.default)(_index.default.ldLabs, (0, _defineProperty2.default)({}, className, !!className)),
       ref: ref
     }));

package/lib/locales/zh-CN.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = exports.default = {
   "luckda.lowcode.view.lc-components.label.all": "全部",
+  "luckda.lowcode.view.lc-component.design.show": "请在预览、运行界面查看嵌入的代理页面",
   "luckda.lowcode.painter.import": "导入",
   "luckda.lowcode.painter.components.fullscreen-exit.tip": "退出全屏",
   "luckda.lowcode.painter.components.fullscreen.tip": "全屏",
@@ -13,6 +14,9 @@ var _default = exports.default = {
   "lc.form.validator.textNum": "个字符",
   "lc.form.validator.numberBelowMin": "低于最小值",
   "lc.form.validator.numberExceedMax": "超过最大值",
+  "luckda.lowcode.design.toolbar.selectUser": "模拟登录人",
+  "luckda.lowcode.design.toolbar.placeholder.selectUser": "请选择模拟登录人",
+  "luckda.lowcode.design.toolbar.debugTool": "调试工具",
   "luckda.lowcode.painter.I18n.empty": "敬请期待",
   "luckda.lowcode.painter.panel.attrs": "属性",
   "luckda.lowcode.painter.panel.css": "样式",
@@ -22,19 +26,28 @@ var _default = exports.default = {
   "luckda.lowcode.modal": "模态视图层",
   "luckda.lowcode.painter.I18n.search": "搜索文案",
   "luckda.lowcode.painter.I18n.add": "新增文案",
+  "luckda.lowcode.version.delete": "你确定要删除该历史版本吗？",
+  "luckda.lowcode.version.confirm.recover": "你确定要还原到该历史版本吗？",
+  "luckda.lowcode.version.recover": "还原版本",
+  "luckda.lowcode.error.pagedata": "页面数据错误",
+  "luckda.lowcode.version.placeholder.search": "请输入查询内容",
+  "app.base.operate.delete": "删除",
+  "luckda.lowcode.version.diff": "差异比对",
+  "luckda.lowcode.version.use": "使用",
+  "luckda.lowcode.version.add": "添加到历史版本",
+  "luckda.lowcode.version.placeholder.title": "请输入版本标题",
+  "luckda.lowcode.version.placeholder.note": "请输入版本描述",
   "luckda.lowcode.design.toolbar.save.on": "保存中...",
   "luckda.lowcode.design.toolbar.save.success": "保存成功",
   "luckda.lowcode.design.toolbar.save.error": "保存失败",
   "luckda.lowcode.design.toolbar.clear.tip": "清除提示",
   "luckda.lowcode.design.toolbar.clear": "清除缓存",
-  "luckda.lowcode.error.pagedata": "页面数据错误",
   "luckda.lowcode.not.mobile": "此功能暂未开放",
   "luckda.lowcode.design.toolbar.pageAttrs": "页面属性",
-  "luckda.lowcode.design.toolbar.debug": "调试",
+  "luckda.lowcode.design.toolbar.shortcut": "快捷键",
   "luckda.lowcode.design.toolbar.code": "Schema面板",
+  "luckda.lowcode.design.toolbar.debug": "调试",
   "luckda.lowcode.design.toolbar.save": "保存",
-  "luckda.lowcode.design.toolbar.pagePreview": "页面预览",
-  "luckda.lowcode.design.toolbar.selectUser": "请选择模拟登录人",
   "app.base.operate.comfire.leave": "离开当前页面？",
   "app.base.operate.comfire.message.leave": "系统可能不会保存您所做的更改。",
   "luckda.lowcode.painter.components.search": "搜索组件",
@@ -72,6 +85,22 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.splitdisplay.split": "分割方向",
   "luckda.lowcode.painter.panel-section.splitdisplay.ratio": "列比例",
   "luckda.lowcode.painter.panel-section.Layoutratio.placeholder": "请输入列比例",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.state": "页面全局状态",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.global": "页面全局变量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.url": "页面URL参数",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.string": "字符串常量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.num": "数字常量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.bool": "布尔常量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-name": "参数名称",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.warn.param-name": "请输入参数名称",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin": "参数来源",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-value": "值或变量名",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.warn.param-value": "请输入参数值或变量名",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.add": "添加参数",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.save": "保存并返回",
+  "luckda.lowcode.painter.panel-section.proxy-linker.add": "新建页面",
+  "luckda.lowcode.painter.panel-section.proxy-linker.edit": "编辑页面",
+  "luckda.lowcode.painter.panel-section.proxy-linker.sync": "同步数据",
   "luckda.lowcode.painter.pageVars.var": "变量",
   "luckda.lowcode.painter.pageVars.api": "远程 API",
   "luckda.lowcode.painter.pageVars.edit": "编辑数据源",
@@ -82,7 +111,6 @@ var _default = exports.default = {
   "luckda.lowcode.painter.pageVars.add": "添加",
   "luckda.lowcode.painter.panel-section.Layoutratio.err": "必须是数字或者数字加:号的组合",
   "luckda.lowcode.painter.panel-section.Layoutratio.label": "列比例",
-  "luckda.lowcode.painter.panel-section.style-panel.sourceedit": "源码编辑",
   "luckda.lowcode.painter.panel-section.impexp.expType.placeholder": "请选择自定义行为",
   "luckda.lowcode.painter.panel-section.impexp.impType.placeholder": "请选择自定义行为",
   "luckda.lowcode.painter.bindCondition": "绑定条件",
@@ -90,6 +118,11 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.fieldsSetting.field": "数据字段",
   "luckda.lowcode.painter.panel-section.fieldsSetting.title": "标题",
   "luckda.lowcode.painter.panel-section.fieldsSetting.batch": "批量设置",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.small": "小",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.default": "中",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.large": "大",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.full": "全屏",
+  "luckda.lowcode.painter.panel-section.dialogSize.size.custom": "定制",
   "luckda.lowcode.painter.dateSetSelector.setting": "配置字段",
   "luckda.lowcode.painter.dateSetSelector.sync": "同步数据",
   "luckda.lowcode.painter.panel-section.complexPop.assisted": "辅助选择",
@@ -115,6 +148,7 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.style-panel.margin.down": "下间距",
   "luckda.lowcode.painter.panel-section.style-panel.margin.left": "左间距",
   "luckda.lowcode.painter.panel-section.style-panel.group-name": "样式设置",
+  "luckda.lowcode.painter.panel-section.style-panel.sourceedit": "源码编辑",
   "luckda.lowcode.painter.panel-section.style-panel.width": "请输入宽度",
   "luckda.lowcode.painter.panel-section.style-panel.height": "请输入高度",
   "luckda.lowcode.painter.panel-section.style-panel.display": "显示",
@@ -174,11 +208,16 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.style-panel.border.width.ph": "线宽",
   "luckda.lowcode.painter.panel-section.style-panel.border.color": "颜色",
   "luckda.lowcode.painter.panel-section.style-panel.background": "背景",
+  "luckda.lowcode.painter.panel-section.jseditor.clear": "确定执行操作吗？",
+  "luckda.lowcode.painter.panel-section.jseditor.saveto": "保存为",
+  "app.base.operate.clear": "清空",
+  "app.base.operate.ok": "确定",
   "luckda.lowcode.painter.panel-section.blocksEditor.auto": "表单",
   "luckda.lowcode.painter.panel-section.blocksEditor.grid": "表格",
   "luckda.lowcode.painter.panel-section.blocksEditor.writer": "行内编辑表格",
   "luckda.lowcode.painter.panel-section.blocksEditor.uploadForm": "附件列表",
   "luckda.lowcode.painter.panel-section.blocksEditor.blank": "空白区",
+  "luckda.lowcode.painter.panel-section.blocksEditor.defaultBlock": "默认区块",
   "luckda.lowcode.painter.panel-section.blocksEditor.addBlock": "新增区块",
   "luckda.lowcode.painter.panel-section.actionsEditor.button": "按钮",
   "luckda.lowcode.painter.panel-section.actionsEditor.text": "文本",
@@ -234,6 +273,20 @@ var _default = exports.default = {
   "luckda.lowcode.painter.actionBindModal.params": "配置参数",
   "luckda.lowcode.painter.actionBindModal.params.info": "请勿随意修改配置参数结构和参数名称，参数异常可能会导致请求失败",
   "luckda.lowcode.painter.actionBindModal.noActionSelected": "请在右侧选择行为项",
+  "luckda.lowcode.design.toolbar.shortcut.save": "保存",
+  "luckda.lowcode.design.toolbar.shortcut.preview": "预览调试",
+  "luckda.lowcode.design.toolbar.shortcut.undo": "撤销",
+  "luckda.lowcode.design.toolbar.shortcut.redo": "重做",
+  "luckda.lowcode.design.toolbar.shortcut.copy": "克隆组件",
+  "luckda.lowcode.design.toolbar.shortcut.delete": "删除组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectParent": "选择父级组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectChildren": "选择子级组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectLeftBrother": "向左选择兄弟组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectRightBrother": "向右选择兄弟组件",
+  "luckda.lowcode.design.toolbar.shortcut.moveLeft": "向左移动组件",
+  "luckda.lowcode.design.toolbar.shortcut.moveRight": "向右移动组件",
+  "luckda.lowcode.design.toolbar.shortcut.general": "常规操作",
+  "luckda.lowcode.design.toolbar.shortcut.others": "组件选择和移动",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align.left": "居左",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align.center": "居中",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align.right": "居右",
@@ -256,6 +309,7 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.fieldsSetting.form.display": "表单中显示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.writable": "是否可写",
   "luckda.lowcode.painter.panel-section.fieldsSetting.readonly": "是否只读",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.dateFormat": "日期格式",
   "luckda.lowcode.painter.panel-section.fieldsSetting.render": "内容定制渲染",
   "luckda.lowcode.painter.panel-section.fieldsSetting.defaultValue": "默认值",
   "luckda.lowcode.painter.settingTo": "设置为",
@@ -281,5 +335,6 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.message.verifyType": "请选择校验规则",
   "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.errorMsg": "错误提示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.message.errorMsg": "请输入错误提示",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.logic": "校验逻辑"
+  "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.logic": "校验逻辑",
+  "luckda.lowcode.view.lc-component.design.nocode": "缺少页面代理编码配置"
 };