@luck-design-biz/luckda 0.0.25-11 → 0.0.25-13

package/es/components/LdAutoForm/index.js

@@ -4,12 +4,24 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick, union, omit } from 'lodash';
+import { reduce, keyBy, isEmpty, pick, union, omit, forEach, debounce } from 'lodash';
 import { BasicDivider } from 'luck-design';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
 import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
 import { LuckDaContext } from "../Builder";
+var didMount = false;
+var debounceFunc = debounce(function (fields, changedValues, allValues, props) {
+  forEach(changedValues, function (val, key) {
+    var _field$events;
+    var field = fields.find(function (f) {
+      return f.field === key;
+    });
+    if (field !== null && field !== void 0 && (_field$events = field.events) !== null && _field$events !== void 0 && _field$events.onValueChange) {
+      field.events.onValueChange(val, key, allValues, props);
+    }
+  });
+}, 300);
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -59,7 +71,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       var col = columnsObj[key];
       if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
         result.push( /*#__PURE__*/React.createElement(BasicDivider, {
-          title: setting === null || setting === void 0 ? void 0 : setting.aliasName
+          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
         }));
       } else if (col !== null && col !== void 0 && col.isShowInForm) {
         var customFiled = filedsRewrite.find(function (_field) {
@@ -69,7 +81,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
         var newCol = _objectSpread(_objectSpread({}, col), {}, {
           setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         }, pick(setting, defaultSet));
         result.push(getFormItem(newCol, _objectSpread(_objectSpread({
           formId: ldId,
@@ -130,6 +142,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     });
   };
   return /*#__PURE__*/React.createElement(AutoForm, _extends({}, props, {
+    onDataLoaded: function onDataLoaded() {
+      didMount = true;
+    },
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
       get: function get(formData) {
@@ -149,7 +164,14 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     })
     // onAdd={onOperate(onAdd, 'add')}
     ,
-    onUpdate: onOperate(onUpdate, 'update')
+    onUpdate: onOperate(onUpdate, 'update'),
+    formOption: {
+      onValuesChange: function onValuesChange(props, changedValues, allValues) {
+        if (didMount) {
+          debounceFunc(fields, changedValues, allValues, props);
+        }
+      }
+    }
   }, formConfig), basicItems);
 };
 export default ldBuilder(buildLdAutoForm);

package/es/components/LdFormList/index.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -46,6 +46,7 @@ var LdFormList = function LdFormList(_ref) {
     showSaveBtn = _ref.showSaveBtn,
     saveBtnTitle = _ref.saveBtnTitle,
     affixLayout = _ref.affixLayout,
+    getContainer = _ref.getContainer,
     _ref$onValueChange = _ref.onValueChange,
     onValueChange = _ref$onValueChange === void 0 ? function () {} : _ref$onValueChange,
     afterSubmit = _ref.afterSubmit,
@@ -56,6 +57,7 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
+    afterSubmitLoading = _ref.afterSubmitLoading,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = useRef(null);
@@ -208,6 +210,7 @@ var LdFormList = function LdFormList(_ref) {
       formUid: formUid,
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
+      afterSubmitLoading && afterSubmitLoading(res);
       setSubmitLoading(false);
       if (success) {
         var mainFormData = res.detail[res.list[0]];
@@ -270,7 +273,8 @@ var LdFormList = function LdFormList(_ref) {
     renderLeft: renderAffixLeft,
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
-    layout: affixLayout || defaultLayout
+    layout: affixLayout || defaultLayout,
+    getContainer: getContainer
   }), sortBy([].concat(_toConsumableArray(formList), _toConsumableArray(formExtra)), function (o) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);

package/es/components/LdGrid/index.js

@@ -190,10 +190,11 @@ var LdIndex = function LdIndex(_ref2) {
     var _getDvaApp2, _getDvaApp3;
     (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
     if (!((_getDvaApp3 = getDvaApp()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
-      var _getDvaApp4;
+      var _getDvaApp4, _props$pagination;
       (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
         behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
       }, overModel), {}, {
+        pageSize: overModel.pageSize || ((_props$pagination = props.pagination) === null || _props$pagination === void 0 ? void 0 : _props$pagination.pageSize) || props.pageSize,
         isFlow: isTreeGrid || !!props.isFlow,
         moduleCode: moduleCode,
         dataSetKey: props.dataSetKey,

package/es/components/LdGridForm/index.js

@@ -84,7 +84,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
         var newCol = _objectSpread(_objectSpread({}, col), {}, {
           setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         });
         var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
         result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
@@ -142,7 +142,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         var _submitData = data.map(function (item) {
           return behaviorKey === 'add' ? _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, null)) : dataFormat(gridColumns, item);
         });
-        if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
+        if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post({
+          values: data,
+          submitData: _submitData,
+          behaviorKey: behaviorKey
+        }); // 以预设为主
         return _defineProperty({}, dataSetKey, _defineProperty({}, "".concat(behaviorKey, "List"), _submitData));
       }
     });

package/es/components/LdTree/index.js

@@ -1,19 +1,19 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef, useLayoutEffect } from 'react';
-import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil } from 'lodash';
+import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil, differenceBy } from 'lodash';
 import { useRequest, useMemoizedFn, useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { Icon, Popover } from 'luck-design/antd';
 import { LuckTree } from 'luck-design';
-import { formatMessage, dataToTree, dragTreeData } from '@luck-design-biz/base/utils';
+import { formatMessage, dataToTree, dragTreeData, flattenTree } from '@luck-design-biz/base/utils';
 import { TreeBox } from '@luck-design-biz/base';
 import ldBuilder from "../../helper/ldBuilder";
 import { behaviorCall } from "../../utils";
@@ -127,9 +127,32 @@ var LdTree = function LdTree(_ref) {
     var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     run(_objectSpread(_objectSpread(_objectSpread({}, params[0]), _params), defaultParams[0]));
   });
+  var handleUpdateTree = function handleUpdateTree(type, nodes) {
+    var data = [];
+    var flattenData = flattenTree(dataSource);
+    switch (type) {
+      case 'delete':
+        data = differenceBy(flattenData, nodes, window.appConfig.constraintKeys.PRIMARY);
+        break;
+      case 'add':
+        data = [].concat(_toConsumableArray(flattenData), _toConsumableArray(nodes));
+        break;
+      default:
+        data = flattenData.map(function (i) {
+          var findNode = nodes.find(function (n) {
+            return n[PRIMARY] === i[PRIMARY];
+          });
+          if (findNode) return _objectSpread(_objectSpread({}, i), findNode);
+          return i;
+        });
+    }
+    var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
+    setDataSource(treeData);
+  };
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, treeRef.current), {}, {
-      onLdQuery: onLdQuery
+      onLdQuery: onLdQuery,
+      updateTree: handleUpdateTree
     });
   });
   useLayoutEffect(function () {
@@ -246,7 +269,6 @@ var LdTree = function LdTree(_ref) {
   }, [readOnly, rootAdd, resources]);
   var onLoadData = useMemoizedFn(function (treeNode) {
     return new Promise(function (resolve) {
-      console.log('treeNode.props.children', treeNode.props.children);
       if (treeNode.props.isLeaf) {
         resolve();
         return;

package/es/helper/form.js

@@ -138,7 +138,7 @@ export function formatCustomProps(comType, props) {
     var propsSetting = ((_props_config$comType = props_config[comType]) === null || _props_config$comType === void 0 ? void 0 : _props_config$comType.propsSetting) || [];
     var propsEvents = ((_props_config$comType2 = props_config[comType]) === null || _props_config$comType2 === void 0 ? void 0 : _props_config$comType2.propsEvents) || [];
     props = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props), pick(setting, propsSetting)), pick(setting.events, propsEvents)), {}, {
-      config: _objectSpread(_objectSpread(_objectSpread({}, props.config || {}), omit(setting, [].concat(_toConsumableArray(propsSetting), ['events']))), omit(setting.events, propsEvents))
+      config: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props.config || {}), setting.config || {}), omit(setting, [].concat(_toConsumableArray(propsSetting), ['events']))), omit(setting.events, propsEvents))
     });
   }
   return props;

package/es/index.js

@@ -7,5 +7,4 @@ export { default as buildLdGridForm } from "./components/LdGridForm";
 export { default as LdInfoPanel } from "./components/LdInfoPanel";
 export { default as LdCard } from "./components/LdCard";
 export { default as LDActions } from "./components/LDActions";
-export { default as LdRuntimeCom } from "./components/LdRuntimeCom";
 export * from "./components/LdCom";

package/es/locales/zh-CN.js

@@ -197,10 +197,6 @@ export default {
   "luckda.lowcode.painter.panel-section.fieldsSetting.pinned": "固定列",
   "luckda.lowcode.painter.panel-section.fieldsSetting.tip": "过长提示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fieldColumn": "占列数",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.fieldRow": "占行数",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.fieldNote": "字段注释",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.fieldTip": "长说明",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.placeholder": "默认提示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.isEqual": "唯一校验",
   "luckda.lowcode.painter.panel-section.fieldsSetting.required": "是否必填",
   "luckda.lowcode.painter.panel-section.fieldsSetting.table.display": "表格中显示",

package/es/lowcode/constants/event-topics.js

@@ -1,5 +1,6 @@
 /******************************** 通用Topic开始 ********************************/
 
+export var PAGE_LOAD_MOUNT = 'page-load-mount';
 // 组件的加载完成事件
 export var COMPONENT_MOUNT = 'component-mount';
 // 组件的卸载事件

package/es/lowcode/engine/factory/panel-item-factory/RadioStrategy.js

@@ -0,0 +1,53 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import React from 'react';
+import { Radio } from 'luck-design/antd';
+import Strategy from "./Strategy";
+var _TYPE_ = 'radio';
+var RadioComp = function RadioComp(_ref) {
+  var _onChange = _ref.onChange,
+    defaultValue = _ref.defaultValue,
+    size = _ref.size,
+    options = _ref.options;
+  return /*#__PURE__*/React.createElement(Radio.Group, {
+    onChange: function onChange(e) {
+      return _onChange(e.target.value);
+    },
+    defaultValue: defaultValue,
+    size: size
+  }, options.map(function (_ref2) {
+    var value = _ref2.value,
+      label = _ref2.label;
+    return /*#__PURE__*/React.createElement(Radio, {
+      key: value,
+      value: value
+    }, label);
+  }));
+};
+var RadioStrategy = /*#__PURE__*/function (_Strategy) {
+  _inherits(RadioStrategy, _Strategy);
+  var _super = _createSuper(RadioStrategy);
+  function RadioStrategy(factory) {
+    var _this;
+    _classCallCheck(this, RadioStrategy);
+    _this = _super.call(this, _TYPE_);
+    factory.register(_TYPE_, _assertThisInitialized(_this));
+    return _this;
+  }
+  _createClass(RadioStrategy, [{
+    key: "match",
+    value: function match(type) {
+      return type === _TYPE_;
+    }
+  }, {
+    key: "builder",
+    value: function builder() {
+      return RadioComp;
+    }
+  }]);
+  return RadioStrategy;
+}(Strategy);
+export { RadioStrategy as default };

package/es/lowcode/engine/factory/panel-item-factory/StringStrategy.js

@@ -14,7 +14,7 @@ var StringComp = function StringComp(_ref) {
     size = _ref.size,
     disabled = _ref.disabled;
   var handleChange = useRef(debounce(function (newValue) {
-    onChange(newValue);
+    onChange(newValue.trim());
   }, 400));
   return /*#__PURE__*/React.createElement(Input, {
     onChange: function onChange(e) {

package/es/lowcode/engine/factory/panel-item-factory/index.js

@@ -6,6 +6,7 @@ import SelectStrategy from "./SelectStrategy";
 import SwitchStrategy from "./SwitchStrategy";
 import CheckboxStrategy from "./CheckboxStrategy";
 import SegmentedStrategy from "./SegmentedStrategy";
+import RadioStrategy from "./RadioStrategy";
 import DynamicStrategy from "./DynamicStrategy";
 import GroupStrategy from "./GroupStrategy";
 var Factory = /*#__PURE__*/function () {
@@ -23,6 +24,7 @@ var Factory = /*#__PURE__*/function () {
       new SelectStrategy(this);
       new CheckboxStrategy(this);
       new SegmentedStrategy(this);
+      new RadioStrategy(this);
       new SwitchStrategy(this);
       new GroupStrategy(this);
     }

package/es/lowcode/engine/launcher.js

@@ -0,0 +1,5 @@
+import { loadScript } from "./tools/helper";
+export default function launcher() {
+  console.log('%c LuckdaLowCodeEngine %c v'.concat(BIZ_VERSION, ' '), 'padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;', 'padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;');
+  window.loadScript = loadScript;
+}

package/es/lowcode/engine/meta/box.props.default.json

@@ -6,7 +6,7 @@
   "group": "container",
   "groupName": "布局",
   "order": 3,
-  "css": "height:60px; width: auto; background-color: #fff;",
+  "css": "height:100%; width: auto; background-color: #fff;",
   "advance": {
     "events": {}
   }

package/es/lowcode/engine/meta/box.props.json

@@ -14,7 +14,7 @@
       "disabled": true
     }
   ],
-  "css": "height:60px; width: auto; background-color: #fff;",
+  "css": "height:100%; width: auto; background-color: #fff;",
   "advance": {
     "events": [
       {