@luck-design-biz/luckda 1.0.1-2 → 1.0.1-3

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", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading"],
+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"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -59,6 +59,8 @@ var LdFormList = function LdFormList(_ref) {
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
     afterSubmitLoading = _ref.afterSubmitLoading,
+    _ref$showConfigBtn = _ref.showConfigBtn,
+    showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = useRef(null);
@@ -121,7 +123,7 @@ var LdFormList = function LdFormList(_ref) {
     return /*#__PURE__*/React.createElement(FormBtn, _extends({
       type: type,
       formId: formId,
-      showConfigBtn: false
+      showConfigBtn: showConfigBtn
     }, extraConfig));
   });
 

package/es/components/LdGridForm/index.js

@@ -70,33 +70,43 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {
+      var _customColumn;
       var setting = fieldsObj[key];
       var col = columnsObj[key];
-      if (col !== null && col !== void 0 && col.isShowInForm) {
-        var _customColumn;
-        var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.aliaName;
-        }) || {};
-        if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
-          editable: false,
-          mode: 'grid'
-        });
-        _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.fieldAliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
-          formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
-            moduleCode: moduleCode,
-            formRef: formRef,
-            formMode: formMode,
-            render: setting === null || setting === void 0 ? void 0 : setting.render,
-            setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
-          })
-        })));
+      if (!(col !== null && col !== void 0 && col.isShowInForm) && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        return result;
       }
+      var customColumn = columnsRewrite.find(function (column) {
+        return column.field === col.aliaName;
+      }) || {};
+      if (col !== null && col !== void 0 && col.isShowInForm && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        customColumn.mode = 'form';
+      } else if (!(col !== null && col !== void 0 && col.isShowInForm) && col !== null && col !== void 0 && col.isShowInGrid) {
+        customColumn.mode = 'grid';
+      }
+      if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
+        editable: false,
+        formItemProps: function formItemProps() {
+          return {
+            readOnly: true
+          };
+        }
+      });
+      _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.fieldAliasName) || col.fieldName
+      });
+      var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip', 'formMode'];
+      result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
+        formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
+          moduleCode: moduleCode,
+          formRef: formRef,
+          formMode: formMode,
+          render: setting === null || setting === void 0 ? void 0 : setting.render,
+          setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
+        })
+      })));
       return result;
     }, []);
     defaultValues.current = _defaultValues;

package/es/locales/zh-CN.js

@@ -227,15 +227,15 @@ export default {
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.none": "不固定",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.left": "左",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.right": "右",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.single": "行修改",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.bulk": "批量修改",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.single": "单行",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.bulk": "批量",
   "luckda.lowcode.painter.delete.tip": "确定删除吗？",
   "luckda.lowcode.painter.panel-section.fieldsSetting.width": "列宽",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align": "内容对齐",
   "luckda.lowcode.painter.panel-section.fieldsSetting.headerAlign": "表头对齐",
   "luckda.lowcode.painter.panel-section.fieldsSetting.pinned": "固定列",
   "luckda.lowcode.painter.panel-section.fieldsSetting.tip": "过长提示",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode": "表单模式",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode": "修改方式",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fieldColumn": "占列数",
   "luckda.lowcode.painter.panel-section.fieldsSetting.isEqual": "唯一校验",
   "luckda.lowcode.painter.panel-section.fieldsSetting.required": "是否必填",

package/es/lowcode/painter/components/field-setting/SettingUI.js

@@ -61,13 +61,13 @@ var _PINNED_OPTIONS_ = [{
 var _FORM_MODE_OPTIONS_ = [{
   label: formatMessage({
     id: "".concat(_I18N_PREFIX_, ".formMode.single"),
-    label: '行修改'
+    label: '单行'
   }),
   value: 'single'
 }, {
   label: formatMessage({
     id: "".concat(_I18N_PREFIX_, ".formMode.bulk"),
-    label: '批量修改'
+    label: '批量'
   }),
   value: 'bulk'
 }];
@@ -84,6 +84,10 @@ var StyledRadio = styled(Radio.Group).withConfig({
   displayName: "StyledRadio",
   componentId: "luckda-6530__sc-1n41f3z-2"
 })(["span.ant-radio + *{padding-left:4px;padding-right:4px;}"]);
+var StyledCheckbox = styled(Checkbox.Group).withConfig({
+  displayName: "StyledCheckbox",
+  componentId: "luckda-6530__sc-1n41f3z-3"
+})([".ant-checkbox-wrapper{font-size:12px;}"]);
 var _DEFAULT_RENDER_CODE = "function render(value, data, rowIndex, params) { \n  return value;\n}";
 var SettingUI = function SettingUI(_ref) {
   var loading = _ref.loading,
@@ -333,9 +337,9 @@ var SettingUI = function SettingUI(_ref) {
   }))), component === 'tableForm' && /*#__PURE__*/React.createElement(PanelItem, {
     label: formatMessage({
       id: "".concat(_I18N_PREFIX_, ".formMode"),
-      label: '表单模式'
+      label: '修改方式'
     })
-  }, /*#__PURE__*/React.createElement(Checkbox.Group, {
+  }, /*#__PURE__*/React.createElement(StyledCheckbox, {
     options: _FORM_MODE_OPTIONS_,
     defaultValue: fieldData.formMode ? [fieldData.formMode] : ['single', 'bulk'],
     onChange: function onChange(val) {

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

@@ -593,7 +593,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
       return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
     },
     afterInit: afterInit,
-    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef)
+    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef),
+    showConfigBtn: false
   }));
 });
 LCForm.defaultProps = omitBadProps(defaultMeta);

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"],
+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"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -66,6 +66,8 @@ var LdFormList = function LdFormList(_ref) {
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
     afterSubmitLoading = _ref.afterSubmitLoading,
+    _ref$showConfigBtn = _ref.showConfigBtn,
+    showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = (0, _react.useRef)(null);
@@ -128,7 +130,7 @@ var LdFormList = function LdFormList(_ref) {
     return /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
       type: type,
       formId: formId,
-      showConfigBtn: false
+      showConfigBtn: showConfigBtn
     }, extraConfig));
   });
 

package/lib/components/LdGridForm/index.js

@@ -78,33 +78,43 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
     var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
+      var _customColumn;
       var setting = fieldsObj[key];
       var col = columnsObj[key];
-      if (col !== null && col !== void 0 && col.isShowInForm) {
-        var _customColumn;
-        var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.aliaName;
-        }) || {};
-        if (col.isReadOnly) customColumn = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
-          editable: false,
-          mode: 'grid'
-        });
-        _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {
-          formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
-            moduleCode: moduleCode,
-            formRef: formRef,
-            formMode: formMode,
-            render: setting === null || setting === void 0 ? void 0 : setting.render,
-            setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
-          })
-        })));
+      if (!(col !== null && col !== void 0 && col.isShowInForm) && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        return result;
       }
+      var customColumn = columnsRewrite.find(function (column) {
+        return column.field === col.aliaName;
+      }) || {};
+      if (col !== null && col !== void 0 && col.isShowInForm && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        customColumn.mode = 'form';
+      } else if (!(col !== null && col !== void 0 && col.isShowInForm) && col !== null && col !== void 0 && col.isShowInGrid) {
+        customColumn.mode = 'grid';
+      }
+      if (col.isReadOnly) customColumn = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
+        editable: false,
+        formItemProps: function formItemProps() {
+          return {
+            readOnly: true
+          };
+        }
+      });
+      _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
+      var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
+        setVerifyRules: setVerifyRules,
+        fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+      });
+      var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip', 'formMode'];
+      result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {
+        formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
+          moduleCode: moduleCode,
+          formRef: formRef,
+          formMode: formMode,
+          render: setting === null || setting === void 0 ? void 0 : setting.render,
+          setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
+        })
+      })));
       return result;
     }, []);
     defaultValues.current = _defaultValues;

package/lib/locales/zh-CN.js

@@ -233,15 +233,15 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.none": "不固定",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.left": "左",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.right": "右",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.single": "行修改",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.bulk": "批量修改",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.single": "单行",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.bulk": "批量",
   "luckda.lowcode.painter.delete.tip": "确定删除吗？",
   "luckda.lowcode.painter.panel-section.fieldsSetting.width": "列宽",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align": "内容对齐",
   "luckda.lowcode.painter.panel-section.fieldsSetting.headerAlign": "表头对齐",
   "luckda.lowcode.painter.panel-section.fieldsSetting.pinned": "固定列",
   "luckda.lowcode.painter.panel-section.fieldsSetting.tip": "过长提示",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode": "表单模式",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode": "修改方式",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fieldColumn": "占列数",
   "luckda.lowcode.painter.panel-section.fieldsSetting.isEqual": "唯一校验",
   "luckda.lowcode.painter.panel-section.fieldsSetting.required": "是否必填",

package/lib/lowcode/painter/components/field-setting/SettingUI.js

@@ -69,13 +69,13 @@ var _PINNED_OPTIONS_ = [{
 var _FORM_MODE_OPTIONS_ = [{
   label: (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".formMode.single"),
-    label: '行修改'
+    label: '单行'
   }),
   value: 'single'
 }, {
   label: (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".formMode.bulk"),
-    label: '批量修改'
+    label: '批量'
   }),
   value: 'bulk'
 }];
@@ -92,6 +92,10 @@ var StyledRadio = (0, _styledComponents.default)(_antd.Radio.Group).withConfig({
   displayName: "StyledRadio",
   componentId: "luckda-6530__sc-1n41f3z-2"
 })(["span.ant-radio + *{padding-left:4px;padding-right:4px;}"]);
+var StyledCheckbox = (0, _styledComponents.default)(_antd.Checkbox.Group).withConfig({
+  displayName: "StyledCheckbox",
+  componentId: "luckda-6530__sc-1n41f3z-3"
+})([".ant-checkbox-wrapper{font-size:12px;}"]);
 var _DEFAULT_RENDER_CODE = "function render(value, data, rowIndex, params) { \n  return value;\n}";
 var SettingUI = function SettingUI(_ref) {
   var loading = _ref.loading,
@@ -341,9 +345,9 @@ var SettingUI = function SettingUI(_ref) {
   }))), component === 'tableForm' && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".formMode"),
-      label: '表单模式'
+      label: '修改方式'
     })
-  }, /*#__PURE__*/_react.default.createElement(_antd.Checkbox.Group, {
+  }, /*#__PURE__*/_react.default.createElement(StyledCheckbox, {
     options: _FORM_MODE_OPTIONS_,
     defaultValue: fieldData.formMode ? [fieldData.formMode] : ['single', 'bulk'],
     onChange: function onChange(val) {

package/lib/lowcode/view/lc-components/Form/index.js

@@ -601,7 +601,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
       return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
     },
     afterInit: afterInit,
-    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef)
+    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef),
+    showConfigBtn: false
   }));
 });
 LCForm.defaultProps = (0, _helper.omitBadProps)(_formPropsDefault.default);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.1-2",
+  "version": "1.0.1-3",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",