ydb-components-material 0.1.162 → 0.1.164

package/es/api.js

@@ -160,4 +160,9 @@ export var getIcons = function getIcons(params, config) {
 };
 export var getGuideImg = function getGuideImg(params, config) {
   return get(config.baseUrl + "/declaration/material/file/files/api/presigned-url", params, config);
+};
+
+// 查字典项
+export var getDictByCode = function getDictByCode(params, config) {
+  return get(config.baseUrl + "/configuration/item-dict/queryByCode", params, config);
 };

package/es/components/file-list/index.js

@@ -2,6 +2,7 @@ import _Balloon from "@alifd/next/es/balloon";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
 import { getFileExtension } from "./file.js";
+import { getDictByCode } from "../../api";
 import Merge from "./merge";
 import FileItem from "./item";
 import "./index.scss";
@@ -15,8 +16,8 @@ var MATERIAL_TYPE = {
 var MATERIAL_FORMAT = {
   1: 'doc',
   2: 'docx',
-  3: 'ofd',
-  4: 'pdf',
+  3: 'pdf',
+  4: 'ofd',
   5: 'xlsx',
   6: 'xls',
   7: 'png',
@@ -54,6 +55,37 @@ var FileList = function FileList(_ref) {
   var _useState = useState(fileList),
     fileArray = _useState[0],
     setFileArray = _useState[1];
+  // 材料格式字典：value -> key，替换硬编码的 MATERIAL_FORMAT
+  var _useState2 = useState({}),
+    materialSpecMap = _useState2[0],
+    setMaterialSpecMap = _useState2[1];
+  useEffect(function () {
+    // 页面初始化时查询材料格式字典
+    getDictByCode({
+      dictCode: 'material_spec'
+    }, {
+      token: token,
+      tokenTY: tokenTY,
+      baseUrl: baseUrl,
+      env: env,
+      isPC: isPC
+    }).then(function (res) {
+      if (res && Array.isArray(res.data)) {
+        var map = {};
+        res.data.forEach(function (item) {
+          map[item.key] = item.value;
+        });
+        setMaterialSpecMap(map);
+      }
+    })["catch"](function (err) {
+      console.error('查询材料格式字典失败', err);
+    });
+  }, []);
+
+  // 根据字典映射格式 code 为格式名，字典未加载时退回硬编码 MATERIAL_FORMAT
+  var formatName = function formatName(code) {
+    return materialSpecMap[code] || MATERIAL_FORMAT[code] || code;
+  };
   useEffect(function () {
     var stored = localStorage.getItem(tokenTY);
     console.log('fileList-stored', stored);
@@ -66,17 +98,17 @@ var FileList = function FileList(_ref) {
       setFileArray(fileList);
     }
   }, [fileList]);
-  var _useState2 = useState(false),
-    showMerge = _useState2[0],
-    setShowMerge = _useState2[1];
-  var _useState3 = useState({
+  var _useState3 = useState(false),
+    showMerge = _useState3[0],
+    setShowMerge = _useState3[1];
+  var _useState4 = useState({
       materialName: '',
       fileList: [],
       index: 0,
       subIndex: 0
     }),
-    curMerge = _useState3[0],
-    setCurMerge = _useState3[1];
+    curMerge = _useState4[0],
+    setCurMerge = _useState4[1];
   var convertNumbersToChinese = function convertNumbersToChinese(str) {
     // 定义基础映射关系
     var digitMap = {
@@ -106,7 +138,7 @@ var FileList = function FileList(_ref) {
       materialType = item.materialType;
     if (!materialSpec) return '';
     var formatText = materialSpec.split(',').map(function (i) {
-      return MATERIAL_FORMAT[i];
+      return formatName(i);
     }).join('、');
     var sizeText = materialSize ? "\u5355\u4E2A\u4E0D\u8D85\u8FC7\u3010" + materialSize + "MB\u3011" : '';
     return "\u9700\u4E0A\u4F20\u3010" + MATERIAL_TYPE[materialType] + "\u3011\uFF0C\u652F\u6301\u3010" + formatText + "\u3011\u683C\u5F0F\u3002" + sizeText;
@@ -123,7 +155,7 @@ var FileList = function FileList(_ref) {
     var groupId = fileArray[index].subMaterials[subIndex].groupId;
     if (!materialSpec) return '';
     var formatText = materialSpec.split(',').map(function (i) {
-      return MATERIAL_FORMAT[i];
+      return formatName(i);
     }).join('、');
     var sameGroupIdMaterials = subMaterials.filter(function (m) {
       return m.groupId === groupId;

package/es/components/file-list/item.js

@@ -577,9 +577,14 @@ var FileItem = function FileItem(_ref) {
     var safeSignatureAgentRole = signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : [];
     var safeSignSelfRole = signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : [];
     var safeSignAgentRole = signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : [];
-    var notNeedSelfSign = !safeSignatureSelfRole.includes(SELF) && !safeSignatureAgentRole.includes(SELF) && !safeSignSelfRole.includes(SELF) && !safeSignAgentRole.includes(SELF);
-    // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
-    if (notNeedSelfSign && needOtherSign) {
+    // 区分自办/代办场景：代办（signerInfo 非空）看 AgentRole，自办看 SelfRole
+    var isAgent = Object.keys(signerInfo).length > 0;
+    var safeSignatureRole = isAgent ? safeSignatureAgentRole : safeSignatureSelfRole;
+    var safeSignRole = isAgent ? safeSignAgentRole : safeSignSelfRole;
+    // 自己不需要签署、但需要别人签署时，直接打开维护签署人信息
+    var notNeedSelfSign = !safeSignatureRole.includes(SELF) && !safeSignRole.includes(SELF);
+    var needOtherSignInScenario = safeSignatureRole.includes(OTHER) || safeSignRole.includes(OTHER);
+    if (notNeedSelfSign && needOtherSignInScenario) {
       setShowSignerInfo(true);
       return;
     }

package/es/components/scene-tree/index.js

@@ -92,7 +92,7 @@ var SceneTree = function SceneTree(_ref) {
           if (Array.isArray(targetOption.mutuallyExclusiveOptions) && targetOption.mutuallyExclusiveOptions.length) {
             targetOption.mutuallyExclusiveOptions.forEach(function (mutuallyExclusiveOption) {
               var targetMutuallyExclusiveOption = targetNodeOfCurTree.options.find(function (option) {
-                return option.id === mutuallyExclusiveOption;
+                return option.groupId === mutuallyExclusiveOption;
               });
               console.log('targetMutuallyExclusiveOption--', targetMutuallyExclusiveOption);
               if (targetMutuallyExclusiveOption) {

package/lib/api.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.signurl = exports.signFileDownApi = exports.qrySealApi = exports.previewApi = exports.post = exports.onlinePreview = exports.getUrlById = exports.getSignOrderIdApi = exports.getSignFileApi = exports.getSealUrlApi = exports.getPcSealUrlApi = exports.getMaterialPreview = exports.getMaterialLib = exports.getIcons = exports.getGuideImg = exports.get = exports.fileUploadApi = exports.documentDownload = exports.createbycategory = exports.contractSignUrl = exports.contractFinish = exports.checkSignState = void 0;
+exports.signurl = exports.signFileDownApi = exports.qrySealApi = exports.previewApi = exports.post = exports.onlinePreview = exports.getUrlById = exports.getSignOrderIdApi = exports.getSignFileApi = exports.getSealUrlApi = exports.getPcSealUrlApi = exports.getMaterialPreview = exports.getMaterialLib = exports.getIcons = exports.getGuideImg = exports.getDictByCode = exports.get = exports.fileUploadApi = exports.documentDownload = exports.createbycategory = exports.contractSignUrl = exports.contractFinish = exports.checkSignState = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
@@ -165,4 +165,9 @@ var getIcons = exports.getIcons = function getIcons(params, config) {
 };
 var getGuideImg = exports.getGuideImg = function getGuideImg(params, config) {
   return get(config.baseUrl + "/declaration/material/file/files/api/presigned-url", params, config);
+};
+
+// 查字典项
+var getDictByCode = exports.getDictByCode = function getDictByCode(params, config) {
+  return get(config.baseUrl + "/configuration/item-dict/queryByCode", params, config);
 };

package/lib/components/file-list/index.js

@@ -7,6 +7,7 @@ var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _file = require("./file.js");
+var _api = require("../../api");
 var _merge = _interopRequireDefault(require("./merge"));
 var _item = _interopRequireDefault(require("./item"));
 require("./index.scss");
@@ -21,8 +22,8 @@ var MATERIAL_TYPE = {
 var MATERIAL_FORMAT = {
   1: 'doc',
   2: 'docx',
-  3: 'ofd',
-  4: 'pdf',
+  3: 'pdf',
+  4: 'ofd',
   5: 'xlsx',
   6: 'xls',
   7: 'png',
@@ -60,6 +61,37 @@ var FileList = function FileList(_ref) {
   var _useState = (0, _react.useState)(fileList),
     fileArray = _useState[0],
     setFileArray = _useState[1];
+  // 材料格式字典：value -> key，替换硬编码的 MATERIAL_FORMAT
+  var _useState2 = (0, _react.useState)({}),
+    materialSpecMap = _useState2[0],
+    setMaterialSpecMap = _useState2[1];
+  (0, _react.useEffect)(function () {
+    // 页面初始化时查询材料格式字典
+    (0, _api.getDictByCode)({
+      dictCode: 'material_spec'
+    }, {
+      token: token,
+      tokenTY: tokenTY,
+      baseUrl: baseUrl,
+      env: env,
+      isPC: isPC
+    }).then(function (res) {
+      if (res && Array.isArray(res.data)) {
+        var map = {};
+        res.data.forEach(function (item) {
+          map[item.key] = item.value;
+        });
+        setMaterialSpecMap(map);
+      }
+    })["catch"](function (err) {
+      console.error('查询材料格式字典失败', err);
+    });
+  }, []);
+
+  // 根据字典映射格式 code 为格式名，字典未加载时退回硬编码 MATERIAL_FORMAT
+  var formatName = function formatName(code) {
+    return materialSpecMap[code] || MATERIAL_FORMAT[code] || code;
+  };
   (0, _react.useEffect)(function () {
     var stored = localStorage.getItem(tokenTY);
     console.log('fileList-stored', stored);
@@ -72,17 +104,17 @@ var FileList = function FileList(_ref) {
       setFileArray(fileList);
     }
   }, [fileList]);
-  var _useState2 = (0, _react.useState)(false),
-    showMerge = _useState2[0],
-    setShowMerge = _useState2[1];
-  var _useState3 = (0, _react.useState)({
+  var _useState3 = (0, _react.useState)(false),
+    showMerge = _useState3[0],
+    setShowMerge = _useState3[1];
+  var _useState4 = (0, _react.useState)({
       materialName: '',
       fileList: [],
       index: 0,
       subIndex: 0
     }),
-    curMerge = _useState3[0],
-    setCurMerge = _useState3[1];
+    curMerge = _useState4[0],
+    setCurMerge = _useState4[1];
   var convertNumbersToChinese = function convertNumbersToChinese(str) {
     // 定义基础映射关系
     var digitMap = {
@@ -112,7 +144,7 @@ var FileList = function FileList(_ref) {
       materialType = item.materialType;
     if (!materialSpec) return '';
     var formatText = materialSpec.split(',').map(function (i) {
-      return MATERIAL_FORMAT[i];
+      return formatName(i);
     }).join('、');
     var sizeText = materialSize ? "\u5355\u4E2A\u4E0D\u8D85\u8FC7\u3010" + materialSize + "MB\u3011" : '';
     return "\u9700\u4E0A\u4F20\u3010" + MATERIAL_TYPE[materialType] + "\u3011\uFF0C\u652F\u6301\u3010" + formatText + "\u3011\u683C\u5F0F\u3002" + sizeText;
@@ -129,7 +161,7 @@ var FileList = function FileList(_ref) {
     var groupId = fileArray[index].subMaterials[subIndex].groupId;
     if (!materialSpec) return '';
     var formatText = materialSpec.split(',').map(function (i) {
-      return MATERIAL_FORMAT[i];
+      return formatName(i);
     }).join('、');
     var sameGroupIdMaterials = subMaterials.filter(function (m) {
       return m.groupId === groupId;

package/lib/components/file-list/item.js

@@ -583,9 +583,14 @@ var FileItem = function FileItem(_ref) {
     var safeSignatureAgentRole = signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : [];
     var safeSignSelfRole = signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : [];
     var safeSignAgentRole = signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : [];
-    var notNeedSelfSign = !safeSignatureSelfRole.includes(SELF) && !safeSignatureAgentRole.includes(SELF) && !safeSignSelfRole.includes(SELF) && !safeSignAgentRole.includes(SELF);
-    // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
-    if (notNeedSelfSign && needOtherSign) {
+    // 区分自办/代办场景：代办（signerInfo 非空）看 AgentRole，自办看 SelfRole
+    var isAgent = Object.keys(signerInfo).length > 0;
+    var safeSignatureRole = isAgent ? safeSignatureAgentRole : safeSignatureSelfRole;
+    var safeSignRole = isAgent ? safeSignAgentRole : safeSignSelfRole;
+    // 自己不需要签署、但需要别人签署时，直接打开维护签署人信息
+    var notNeedSelfSign = !safeSignatureRole.includes(SELF) && !safeSignRole.includes(SELF);
+    var needOtherSignInScenario = safeSignatureRole.includes(OTHER) || safeSignRole.includes(OTHER);
+    if (notNeedSelfSign && needOtherSignInScenario) {
       setShowSignerInfo(true);
       return;
     }

package/lib/components/scene-tree/index.js

@@ -98,7 +98,7 @@ var SceneTree = function SceneTree(_ref) {
           if (Array.isArray(targetOption.mutuallyExclusiveOptions) && targetOption.mutuallyExclusiveOptions.length) {
             targetOption.mutuallyExclusiveOptions.forEach(function (mutuallyExclusiveOption) {
               var targetMutuallyExclusiveOption = targetNodeOfCurTree.options.find(function (option) {
-                return option.id === mutuallyExclusiveOption;
+                return option.groupId === mutuallyExclusiveOption;
               });
               console.log('targetMutuallyExclusiveOption--', targetMutuallyExclusiveOption);
               if (targetMutuallyExclusiveOption) {

package/lowcode_es/meta.js

@@ -98,7 +98,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.162';
+    version = '0.1.164';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -103,7 +103,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.162';
+    version = '0.1.164';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.162",
+  "version": "0.1.164",
   "description": "ydb-components-material",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -102,10 +102,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.162/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.164/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/ydb-components-material@0.1.162/build/index.html"
+  "homepage": "https://unpkg.com/ydb-components-material@0.1.164/build/index.html"
 }