venus-design 1.0.41 → 1.0.43

package/dist/SelectCompoments/SelectUserOrDeptBySeclevel/selectPanel/user.js

@@ -54,7 +54,6 @@ var Search = _Input.Search;
 var VenusUser = function VenusUser(props) {
   //选择该部门下的所有人时的人员id集合
   var dataKeysData = [];
-
   //选择的部门
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -119,7 +118,7 @@ var VenusUser = function VenusUser(props) {
             _context.next = 8;
             return getUserOrgTreeList({
               queryLikeWork: "",
-              objectSecId: user && user.seclevelId,
+              objectSecId: props.secId == -1 ? user && user.seclevelId : props.secId,
               type: "high"
             });
           case 8:

package/dist/VenusForm/handleVenusFormFunctions.d.ts

@@ -3,7 +3,7 @@ import { VenusFormDataVo, VenusFormGroupInterface, VenusFormItemInterface, Venus
  * 组装表单项
  * @param formGroupData 表单分组的集合
  */
-export declare const handleFormItems: (formGroupData: VenusFormGroupInterface[], type: string, disabled: boolean, formWatchData: {}) => any;
+export declare const handleFormItems: (formGroupData: VenusFormGroupInterface[], type: string, disabled: boolean, formWatchData: {}, getSecId: () => string) => any;
 /**
  * 处理树型表单项的下拉选项集合
  */

package/dist/VenusForm/handleVenusFormFunctions.js

@@ -16,12 +16,12 @@ import { handleDataIndex } from "../VenusTable/handleVenusTableFunctions";
  * @param formGroupData 表单分组的集合
  */
 
-export var handleFormItems = function handleFormItems(formGroupData, type, disabled, formWatchData) {
+export var handleFormItems = function handleFormItems(formGroupData, type, disabled, formWatchData, getSecId) {
   var formItems = [];
   if (formGroupData != null && formGroupData.length > 0) {
     formGroupData.map(function (v, n) {
       if (v != null) {
-        var formGroupDataNode = handleFormGroup(v, type == undefined ? "false" : type, disabled, formWatchData) || /*#__PURE__*/React.createElement(React.Fragment, null);
+        var formGroupDataNode = handleFormGroup(v, type == undefined ? "false" : type, disabled, formWatchData, getSecId) || /*#__PURE__*/React.createElement(React.Fragment, null);
         formItems.push(formGroupDataNode);
       }
     });
@@ -37,11 +37,11 @@ export var handleFormItems = function handleFormItems(formGroupData, type, disab
  * @param formGroup 表单分组
  * @returns 
  */
-var handleFormGroup = function handleFormGroup(formGroup, type, disabled, formWatchData) {
+var handleFormGroup = function handleFormGroup(formGroup, type, disabled, formWatchData, getSecId) {
   return /*#__PURE__*/React.createElement(ProForm.Group, {
     key: formGroup.groupId,
     title: formGroup.groupName || "基础信息"
-  }, handleColumnFnsics(formGroup.attributeList, type, disabled, formWatchData));
+  }, handleColumnFnsics(formGroup.attributeList, type, disabled, formWatchData, getSecId));
 };
 
 /**
@@ -49,13 +49,13 @@ var handleFormGroup = function handleFormGroup(formGroup, type, disabled, formWa
  * @param formColumns 表单项
  * @returns 
  */
-var handleColumnFnsics = function handleColumnFnsics(formColumns, type, disabled, formWatchData) {
+var handleColumnFnsics = function handleColumnFnsics(formColumns, type, disabled, formWatchData, getSecId) {
   var columnList = [];
   for (var i = 0; i < formColumns.length; i++) {
     var handleFormItemType = VENUS_FORM_ITEM_TYPE[formColumns[i].formUnitType] || function () {
       return {};
     };
-    var column = handleFormItemType(formColumns[i], type, disabled, formWatchData);
+    var column = handleFormItemType(formColumns[i], type, disabled, formWatchData, getSecId);
     columnList.push(column);
   }
   return columnList;

package/dist/VenusForm/index.js

@@ -74,6 +74,17 @@ var VenusForm = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [props.initApi, formData]);
 
+  /**
+   * 获取密级方法
+   * @returns 
+   */
+  var getSecId = function getSecId() {
+    if (props.getSecId) {
+      return props.getSecId();
+    }
+    return props.form.getFieldValue("securityLevelId") ? props.form.getFieldValue("securityLevelId").value : -1;
+  };
+
   /**
    * 执行initApi
    */
@@ -226,6 +237,14 @@ var VenusForm = /*#__PURE__*/forwardRef(function (props, ref) {
           return clone;
         });
       },
+      //获取表单项
+      getFormDataField: function getFormDataField() {
+        return formData;
+      },
+      //设置表单项
+      setFormDataField: function setFormDataField(formData) {
+        setFormData(formData);
+      },
       /* 3. 一键全部禁用/启用 */
       setDisabledAllField: function setDisabledAllField(disabled) {
         setFormData(function (prev) {
@@ -306,7 +325,7 @@ var VenusForm = /*#__PURE__*/forwardRef(function (props, ref) {
     colon: props.colon || true //标签后的冒号
     ,
     disabled: props.disabled || false //是否禁用
-  }), handleFormItems(formData, props.adjustFlag !== undefined ? "adjust" : isEdit + "", props.disabled || false, formWatchData) //处理表单项
+  }), handleFormItems(formData, props.adjustFlag !== undefined ? "adjust" : isEdit + "", props.disabled || false, formWatchData, getSecId) //处理表单项
   , props.children,
   //提交和取消按钮
   !props.submitNodeFlag && props.submitNodeFlag !== undefined ? null : props.haveSaveFlag && props.haveSaveFlag ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {

package/dist/VenusForm/interface.d.ts

@@ -92,6 +92,7 @@ export interface VenusFormType {
     form: any;
     dataViewIid?: String;
     dataSceneIid?: String;
+    getSecId?: Function;
     initApi?: Function;
     isEdit?: boolean;
     loading?: boolean;

package/dist/VenusForm/staticAttr.js

@@ -502,7 +502,7 @@ export var VENUS_FORM_ITEM_TYPE = {
       }]
     });
   },
-  "UserPicker": function UserPicker(column, type, disabled, formData) {
+  "UserPicker": function UserPicker(column, type, disabled, formData, getSecId) {
     return /*#__PURE__*/React.createElement(FormItem2, {
       width: "md",
       name: handleDataIndex(column.fieldId, column),
@@ -529,15 +529,15 @@ export var VENUS_FORM_ITEM_TYPE = {
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       isMultiple: column.parameterSource.isMultiple != undefined ? column.parameterSource.isMultiple : false //不能多选
       ,
-      secId: -1
+      secId: getSecId()
     }) : /*#__PURE__*/React.createElement(SelectUDRBySecLevelId, {
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       isMultiple: column.parameterSource.isMultiple != undefined ? column.parameterSource.isMultiple : false //不能多选
       ,
-      secId: -1
+      secId: getSecId()
     }));
   },
-  "DeptPicker": function DeptPicker(column, type, disabled, formData) {
+  "DeptPicker": function DeptPicker(column, type, disabled, formData, getSecId) {
     return /*#__PURE__*/React.createElement(FormItem2, {
       width: "md",
       name: handleDataIndex(column.fieldId, column),

package/package.json

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