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

package/lib/components/LDActions/index.less

@@ -1,68 +1,68 @@
-@spanDefault: #262626;
-@spanPrimary: var(--ant-primary-color);
-@spanDanger: #ff4d4f;
-@spanDestroy: #820014;
-
-.ldActions {
-
-  button:not(:last-child) {
-    margin-right: 4px;
-  }
-  button:not(:first-child) {
-    margin-left: 4px;
-  }
-  span {
-    cursor: pointer;
-  }
-
-  button.default {
-    background-color: white;
-  }
-  span.default {
-    color: @spanDefault;
-  }
-
-  button.primary {
-    background-color: var(--ant-primary-color);
-    border-color: var(--ant-primary-color);
-    color: white;
-  }
-  span.primary {
-    color: @spanPrimary;
-  }
-
-  button.danger {
-    background-color: #ff4d4f;
-    border-color: #ff4d4f;
-    color: white;
-  }
-  span.danger {
-    color: @spanDanger;
-  }
-
-  button.destroy {
-    background-color: #820014;
-    border-color: #820014;
-    color: white;
-  }
-  span.destroy {
-    color: @spanDestroy;
-  }
-
-  span.disabled {
-    color: #bfbfbf;
-    cursor: not-allowed;
-  }
-}
-span.default.menuItem {
-  color: @spanDefault;
-}
-span.primary.menuItem {
-  color: @spanPrimary;
-}
-span.danger.menuItem {
-  color: @spanDanger;
-}
-span.destroy.menuItem {
-  color: @spanDestroy;
-}
+@spanDefault: #262626;
+@spanPrimary: var(--ant-primary-color);
+@spanDanger: #ff4d4f;
+@spanDestroy: #820014;
+
+.ldActions {
+
+  button:not(:last-child) {
+    margin-right: 4px;
+  }
+  button:not(:first-child) {
+    margin-left: 4px;
+  }
+  span {
+    cursor: pointer;
+  }
+
+  button.default {
+    background-color: white;
+  }
+  span.default {
+    color: @spanDefault;
+  }
+
+  button.primary {
+    background-color: var(--ant-primary-color);
+    border-color: var(--ant-primary-color);
+    color: white;
+  }
+  span.primary {
+    color: @spanPrimary;
+  }
+
+  button.danger {
+    background-color: #ff4d4f;
+    border-color: #ff4d4f;
+    color: white;
+  }
+  span.danger {
+    color: @spanDanger;
+  }
+
+  button.destroy {
+    background-color: #820014;
+    border-color: #820014;
+    color: white;
+  }
+  span.destroy {
+    color: @spanDestroy;
+  }
+
+  span.disabled {
+    color: #bfbfbf;
+    cursor: not-allowed;
+  }
+}
+span.default.menuItem {
+  color: @spanDefault;
+}
+span.primary.menuItem {
+  color: @spanPrimary;
+}
+span.danger.menuItem {
+  color: @spanDanger;
+}
+span.destroy.menuItem {
+  color: @spanDestroy;
+}

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));
   });
 
@@ -222,9 +224,9 @@ var LdFormList = function LdFormList(_ref) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
         } else {
-          var _formListRef$current;
+          var _formListRef$current, _formListRef$current2;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
+          (_formListRef$current2 = formListRef.current) === null || _formListRef$current2 === void 0 || _formListRef$current2.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
             formListRef.current.setFormMode('info');
           });
         }

package/lib/components/LdGrid/index.js

@@ -101,10 +101,10 @@ var LdGrid = function LdGrid(_ref) {
     });
   }, [batchOperations]);
 
-  /**
-   * 优先级
-   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
-   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) {

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/components/LdGridForm/index.less

@@ -1,7 +1,7 @@
-.ldGridForm {
-  :global {
-    .ag-layout-auto-height {
-      height: 100% !important;
-    }
-  }
-}
+.ldGridForm {
+  :global {
+    .ag-layout-auto-height {
+      height: 100% !important;
+    }
+  }
+}

package/lib/components/LdTree/index.less

@@ -1,41 +1,41 @@
-.tree {
-  .nodeTitle {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    user-select: none;
-
-    div {
-      flex: 1;
-      overflow-x: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-
-    div.nodeTitleDisabled {
-      color: var(--luck-text-color-disabled);
-    }
-
-    div.nodeTitleDisabled:hover {
-      cursor: not-allowed;
-    }
-  }
-
-  :global {
-    .ant-tree-title {
-      width: 100%;
-    }
-  }
-}
-
-.classTreeOperates {
-  :global(.ant-popover-inner-content) {
-    padding: 0;
-  }
-
-  .rightMenu {
-    display: block;
-    padding: 4px 8px;
-    color: var(--luck-text-color-);
-  }
+.tree {
+  .nodeTitle {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    user-select: none;
+
+    div {
+      flex: 1;
+      overflow-x: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    div.nodeTitleDisabled {
+      color: var(--luck-text-color-disabled);
+    }
+
+    div.nodeTitleDisabled:hover {
+      cursor: not-allowed;
+    }
+  }
+
+  :global {
+    .ant-tree-title {
+      width: 100%;
+    }
+  }
+}
+
+.classTreeOperates {
+  :global(.ant-popover-inner-content) {
+    padding: 0;
+  }
+
+  .rightMenu {
+    display: block;
+    padding: 4px 8px;
+    color: var(--luck-text-color-);
+  }
 }

package/lib/helper/action.js

@@ -14,12 +14,12 @@ var _utils2 = require("../utils");
 var _form = require("./form");
 // 通用方法
 
-/**
- * 提交行为
- * @param action 行为
- * @param data 数据
- * @param parmas 附件设置
- * @param moduleData 当前模块信息
+/**
+ * 提交行为
+ * @param action 行为
+ * @param data 数据
+ * @param parmas 附件设置
+ * @param moduleData 当前模块信息
  */
 var doAction = exports.doAction = function doAction(action) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/lib/helper/form.js

@@ -38,11 +38,11 @@ var defaultComName = exports.defaultComName = {
   complex: 'complex'
 };
 
-/**
- * 动态表单配置项转译
- * @param {key string} keyStr
- * @param {label string} labelStr
- * @returns [{key,label}]
+/**
+ * 动态表单配置项转译
+ * @param {key string} keyStr
+ * @param {label string} labelStr
+ * @returns [{key,label}]
  */
 var splitStrToObj = exports.splitStrToObj = function splitStrToObj(keyStr, labelStr) {
   var keys = keyStr && keyStr.length > 0 ? keyStr.split(',') : undefined;
@@ -59,11 +59,11 @@ var splitStrToObj = exports.splitStrToObj = function splitStrToObj(keyStr, label
   return undefined;
 };
 
-/**
- * 动态表单配置项转译
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns {name: '',...}
+/**
+ * 动态表单配置项转译
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns {name: '',...}
  */
 function translator() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -130,10 +130,10 @@ function translator() {
   return _props;
 }
 
-/**
- * 删除自动移操作中的不可覆盖字段
- * @param props
- * @returns {{multiple}|*}
+/**
+ * 删除自动移操作中的不可覆盖字段
+ * @param props
+ * @returns {{multiple}|*}
  */
 function formatCustomProps(comType, props) {
   var _props2, _props3;

package/lib/helper/index.less

@@ -1,7 +1,7 @@
-.ldLabs{
-  :global{
-    .ant-tabs-bar{
-      margin: 0 0 4px 0;
-    }
-  }
-}
+.ldLabs{
+  :global{
+    .ant-tabs-bar{
+      margin: 0 0 4px 0;
+    }
+  }
+}

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": "是否必填",