@bit-sun/business-component 2.2.0-alpha.13 → 2.2.0-alpha.15

package/dist/index.esm.js

@@ -30590,6 +30590,14 @@ function convertFileds(fields, falltValue, faltFieldRange, containerName) {
       if (returnField) {
         var _returnField$name;
         returnField.label = field === null || field === void 0 ? void 0 : field.label;
+        if (field === null || field === void 0 ? void 0 : field.disabled) {
+          // 字段设置只读属性
+          returnField.field.props.disabled = true;
+        }
+        if (field === null || field === void 0 ? void 0 : field.invisible) {
+          // 字段设置不可见属性
+          returnField.initialVisible = false;
+        }
         if (Array.isArray(returnField.name) && ((_returnField$name = returnField.name) === null || _returnField$name === void 0 ? void 0 : _returnField$name.includes("extensionFields"))) {
           returnField.notShowLabel = true;
         }
@@ -30833,11 +30841,26 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       });
     });
     setTableJsonEditorValsArr(_toConsumableArray(detailTableCodeFilter));
-    detailTableCodeFilter.map(function (item) {
+    var lastRes = detailTableCodeFilter.map(function (item) {
       if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
-        onClickRunDetailTables(item.initialSetting, false, item.tableCode, detailTableCodeFilter);
+        var _codeProps = {
+          fields: [],
+          columns: item === null || item === void 0 ? void 0 : item.columns
+        };
+        var newValue = {
+          fields: [],
+          columns: item.initialSetting
+        };
+        var result = hanleCallbackValue(_codeProps, newValue, item === null || item === void 0 ? void 0 : item.customerFields);
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: result === null || result === void 0 ? void 0 : result.columns
+        });
       }
+      return item;
     });
+    if (lastRes.length) {
+      saveTableCallBack(lastRes, false);
+    }
   }, [detailTablesSetting.length]);
   var onClickRun = function onClickRun(value, isSave) {
     setJsonEditorVal(value);
@@ -30865,7 +30888,7 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       var target = targetTableSource.find(function (item) {
         return item.tableCode == targetCode;
       });
-      var _codeProps = {
+      var _codeProps2 = {
         fields: [],
         columns: target === null || target === void 0 ? void 0 : target.columns
       };
@@ -30873,7 +30896,7 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
         fields: [],
         columns: value
       };
-      var result = hanleCallbackValue(_codeProps, newValue, target === null || target === void 0 ? void 0 : target.customerFields);
+      var result = hanleCallbackValue(_codeProps2, newValue, target === null || target === void 0 ? void 0 : target.customerFields);
       saveTableCallBack({
         columns: result.columns,
         tableCode: targetCode

package/dist/index.js

@@ -30608,6 +30608,14 @@ function convertFileds(fields, falltValue, faltFieldRange, containerName) {
       if (returnField) {
         var _returnField$name;
         returnField.label = field === null || field === void 0 ? void 0 : field.label;
+        if (field === null || field === void 0 ? void 0 : field.disabled) {
+          // 字段设置只读属性
+          returnField.field.props.disabled = true;
+        }
+        if (field === null || field === void 0 ? void 0 : field.invisible) {
+          // 字段设置不可见属性
+          returnField.initialVisible = false;
+        }
         if (Array.isArray(returnField.name) && ((_returnField$name = returnField.name) === null || _returnField$name === void 0 ? void 0 : _returnField$name.includes("extensionFields"))) {
           returnField.notShowLabel = true;
         }
@@ -30851,11 +30859,26 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       });
     });
     setTableJsonEditorValsArr(_toConsumableArray(detailTableCodeFilter));
-    detailTableCodeFilter.map(function (item) {
+    var lastRes = detailTableCodeFilter.map(function (item) {
       if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
-        onClickRunDetailTables(item.initialSetting, false, item.tableCode, detailTableCodeFilter);
+        var _codeProps = {
+          fields: [],
+          columns: item === null || item === void 0 ? void 0 : item.columns
+        };
+        var newValue = {
+          fields: [],
+          columns: item.initialSetting
+        };
+        var result = hanleCallbackValue(_codeProps, newValue, item === null || item === void 0 ? void 0 : item.customerFields);
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: result === null || result === void 0 ? void 0 : result.columns
+        });
       }
+      return item;
     });
+    if (lastRes.length) {
+      saveTableCallBack(lastRes, false);
+    }
   }, [detailTablesSetting.length]);
   var onClickRun = function onClickRun(value, isSave) {
     setJsonEditorVal(value);
@@ -30883,7 +30906,7 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       var target = targetTableSource.find(function (item) {
         return item.tableCode == targetCode;
       });
-      var _codeProps = {
+      var _codeProps2 = {
         fields: [],
         columns: target === null || target === void 0 ? void 0 : target.columns
       };
@@ -30891,7 +30914,7 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
         fields: [],
         columns: value
       };
-      var result = hanleCallbackValue(_codeProps, newValue, target === null || target === void 0 ? void 0 : target.customerFields);
+      var result = hanleCallbackValue(_codeProps2, newValue, target === null || target === void 0 ? void 0 : target.customerFields);
       saveTableCallBack({
         columns: result.columns,
         tableCode: targetCode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.2.0-alpha.13",
+  "version": "2.2.0-alpha.15",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/JsonQueryTable/index.tsx

@@ -82,7 +82,14 @@ function convertFileds (fields, falltValue, faltFieldRange, containerName) {
     } else  {
       const returnField = field.isStaticCode ? falltValue[containerName ? (containerName + field.name) : field.name] : faltFieldRange[field.name];
       if (returnField) {
-        returnField.label = field?.label;
+        returnField.label = field?.label; 
+        if(field?.disabled){ // 字段设置只读属性
+          returnField.field.props.disabled = true;
+        }
+        if(field?.invisible){ // 字段设置不可见属性
+          returnField.initialVisible = false;
+        }
+        
         if(Array.isArray(returnField.name)&&returnField.name?.includes("extensionFields")){
           returnField.notShowLabel = true;
         }
@@ -327,11 +334,27 @@ const JsonQueryTable = React.memo(props => {
       }
     });
     setTableJsonEditorValsArr([...detailTableCodeFilter]);
-    detailTableCodeFilter.map(item => {
+    const lastRes = detailTableCodeFilter.map(item => {
       if(item?.initialSetting && item?.initialSetting.length){
-        onClickRunDetailTables(item.initialSetting, false, item.tableCode, detailTableCodeFilter);
+        const codeProps = {
+          fields: [],
+          columns: item?.columns,
+        };
+        const newValue = {
+          fields: [],
+          columns: item.initialSetting
+        };
+        const result = hanleCallbackValue(codeProps, newValue, item?.customerFields);
+        return {
+          ...item,
+          columns: result?.columns
+        }
       }
-    })
+      return item;
+    });
+    if(lastRes.length){
+      saveTableCallBack(lastRes, false);
+    }
   },[detailTablesSetting.length]);
   
   const onClickRun = (value, isSave) => {