venus-design 1.0.87 → 1.0.89

package/dist/Approval/index.js

@@ -155,6 +155,9 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
                 wfBaseCode: workflowcode,
                 wfBaseName: workflowname
               }]);
+              form.setFieldsValue({
+                processDef: workflowcode
+              });
             }
             // 4. 处理 componentUrl
             if (_componentUrl) {
@@ -165,7 +168,7 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
               break;
             }
             _context.next = 20;
-            return getWfTitle(wfTitleConfig, record);
+            return getWfTitle(wfTitleConfig, record.data);
           case 20:
             wfTitle = _context.sent;
             name = wfTitle;
@@ -209,25 +212,23 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            console.log(workflowcode);
             form.setFieldsValue({
               person: null
             });
             // 3. 查询审批人
-            _context2.next = 4;
+            _context2.next = 3;
             return findByUserid(workflowcode, record);
-          case 4:
+          case 3:
             userRes = _context2.sent;
             if (userRes !== null && userRes !== void 0 && userRes.success) {
-              _context2.next = 8;
+              _context2.next = 7;
               break;
             }
             _message.error('查询候选人失败！');
             // setDefaultName(record, name);
             return _context2.abrupt("return");
-          case 8:
+          case 7:
             _ref3 = (_userRes$data = userRes.data) !== null && _userRes$data !== void 0 ? _userRes$data : {}, rolename = _ref3.rolename, username = _ref3.username, selectType = _ref3.selectType;
-            console.log(username);
             setuserdata(userRes.data);
             setSelectType(selectType);
 
@@ -245,7 +246,7 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
               }
               options.push.apply(options, _toConsumableArray(users));
             }
-          case 15:
+          case 13:
           case "end":
             return _context2.stop();
         }

package/dist/SearchHight/index.d.ts

@@ -59,5 +59,4 @@ export declare const getColumnNumberSearchProps: (dataIndex: string) => {
     }) => React.JSX.Element;
     filterIcon: (filtered: boolean) => React.JSX.Element;
     onFilter: boolean;
-    render: (text: string) => string;
 };

package/dist/SearchHight/index.js

@@ -336,9 +336,7 @@ export var getColumnNumberSearchProps = function getColumnNumberSearchProps(data
         }
       }));
     },
-    onFilter: true,
-    render: function render(text) {
-      return text;
-    }
+    onFilter: true
+    // render: (text:string) => text
   };
 };

package/dist/VenusTable/handleVenusTableFunctions.js

@@ -28,7 +28,7 @@ export var handleColumnFns = function handleColumnFns(columnList, showIndexColum
       dataIndex: "number",
       align: 'center',
       key: "number",
-      width: 50,
+      width: (actions === null || actions === void 0 ? void 0 : actions.IndexColumnWidth) || 50,
       render: function render(text, record, index) {
         return "".concat((current - 1) * pageSize + (index + 1));
       }

package/dist/VenusTable/index.js

@@ -100,7 +100,7 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     dataParam = _useState8[0],
     setdataParam = _useState8[1];
-  var _useState9 = useState(pageInfoPagin || {
+  var _useState9 = useState(pageInfoPagin || props.defaultPageInfo || {
       current: 1,
       pageSize: 15
     }),
@@ -345,13 +345,21 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
               //获取当前系统标识
               ownerApp = storage.getSessionItem("OWNER_APP");
               appPrefix = APP_PREFIXS[ownerApp.code];
-              _context3.next = 4;
+              if (!(props.actions && props.actions.onUpdateFields)) {
+                _context3.next = 6;
+                break;
+              }
+              props.actions.onUpdateFields(value, fieldName, innerId);
+              _context3.next = 10;
+              break;
+            case 6:
+              _context3.next = 8;
               return updateFields({
                 updateFieldValue: value,
                 updateFieldName: fieldName,
                 innerId: innerId
               }, props.apiPrefix || appPrefix, record.classId.toLowerCase());
-            case 4:
+            case 8:
               res = _context3.sent;
               if (res && res.success) {
                 //更新成功
@@ -359,10 +367,7 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
                   props.actions.updateFieldValueAfter(value, fieldName, innerId, record, res);
                 }
               }
-              /*if(props.actions&&props.actions.onUpdateFields){
-                  props.actions.onUpdateFields(value,fieldName,innerId);
-              }*/
-            case 6:
+            case 10:
             case "end":
               return _context3.stop();
           }

package/dist/VenusTable/interface.d.ts

@@ -42,6 +42,7 @@ export default interface VenusTableType {
     exportFileName?: String;
     scroll?: any;
     alwaysShowAlert?: boolean;
+    defaultPageInfo?: any;
     key?: string;
     onChangeTable?: Function;
     filters?: VenusEnumType[];

package/dist/VenusTable/services.js

@@ -15,7 +15,7 @@ function _updateFields() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request("".concat(urlPrefix, "/update/field"), {
+          return _context.abrupt("return", request("/".concat(urlPrefix, "/update/field"), {
             method: 'post',
             data: data,
             prefix: prefix

package/dist/VenusTable/staticAttr.js

@@ -409,32 +409,32 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
     };
   },
   "renderStatus": function renderStatus(column, actions) {
-    return function (text, record, _, action) {
-      return [record.stateId == "DRAFT" ? /*#__PURE__*/React.createElement(_Badge, {
+    return function (text, record) {
+      return [text == "DRAFT" ? /*#__PURE__*/React.createElement(_Badge, {
         status: "success",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.stateId == "ADJUSTAPPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : text == "ADJUSTAPPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
         status: "processing",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.stateId == "APPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : text == "APPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
         status: "error",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.stateId == "COMPLETED" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : text == "COMPLETED" ? /*#__PURE__*/React.createElement(_Badge, {
         color: "rgb(0, 255, 119)",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.stateId == "DISAGREE" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : text == "DISAGREE" ? /*#__PURE__*/React.createElement(_Badge, {
         color: "rgb(255, 0, 30)",
         text: text,
         style: {
@@ -507,6 +507,11 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
           return /*#__PURE__*/React.createElement("span", null, text);
         }
       }
+      if (actions && actions.isEditCell) {
+        if (!actions.isEditCell(record.innerId, column.fieldId)) {
+          return /*#__PURE__*/React.createElement("span", null, text);
+        }
+      }
       var key = "".concat(record.innerId, "-").concat(column.fieldId);
       var editing = Boolean(actions.editingMap[key]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venus-design",
-  "version": "1.0.87",
+  "version": "1.0.89",
   "description": "venus all compoments",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",