3d-decorate-platform 1.0.20 → 1.0.22

package/dist/index.umd.js

@@ -864,6 +864,18 @@
 
   // http request 拦截器
   http.interceptors.request.use(function (config) {
+    config.vbimRequestSource = '3d-decorate-platform';
+    var requestURL = /^(?:https?:)?\/\//i.test(config.url || '') ? config.url : "".concat(config.baseURL || '').concat(config.url || '');
+    var requestHost = requestURL.match(/^(?:https?:)?\/\/([^/:?#]+)/i);
+    if (requestHost && /(^|\.)vanke\.com$/i.test(requestHost[1]) && typeof console !== 'undefined' && console.warn) {
+      var requestPath = requestURL.slice(requestHost[0].length).split(/[?#]/)[0] || '/';
+      console.warn('[VBIM_AXIOS_DOMAIN_TRACE]', {
+        source: config.vbimRequestSource,
+        method: config.method,
+        host: requestHost[1],
+        path: requestPath
+      });
+    }
     var projectData = JSON.parse(sessionStorage.getItem('projectData'));
     if (projectData && projectData.projectId) {
       config.headers['projectId'] = projectData.projectId;
@@ -6344,10 +6356,10 @@
       _useState0 = _slicedToArray(_useState9, 2),
       submitting = _useState0[0],
       setSubmitting = _useState0[1];
-    var _useState1 = React.useState(null),
+    var _useState1 = React.useState({}),
       _useState10 = _slicedToArray(_useState1, 2),
-      uploadingType = _useState10[0],
-      setUploadingType = _useState10[1];
+      uploadingTypes = _useState10[0],
+      setUploadingTypes = _useState10[1];
     var fileInputRef = React.useRef(null);
     var currentUploadType = React.useRef(null);
     var _useState11 = React.useState(false),
@@ -6427,7 +6439,7 @@
           setBatchOneMaterialId('');
           setBatchOneFiles(createEmptyBatchOneFiles());
         }
-        setUploadingType(null);
+        setUploadingTypes({});
         setIsDraggingRef(false);
         setIsDraggingPbr({});
         setIsBatchMultiDragging(false);
@@ -6751,8 +6763,7 @@
       var selectedFile = files === null || files === void 0 ? void 0 : files[0];
       if (selectedFile) {
         if (validateImageFile(selectedFile)) {
-          currentUploadType.current = 'reference';
-          handleUpload(selectedFile);
+          handleUpload(selectedFile, 'reference');
         }
       }
     };
@@ -6791,26 +6802,26 @@
         var selectedFile = files === null || files === void 0 ? void 0 : files[0];
         if (selectedFile) {
           if (validateImageFile(selectedFile)) {
-            currentUploadType.current = key;
-            handleUpload(selectedFile);
+            handleUpload(selectedFile, key);
           }
         }
       };
     };
     var handleUpload = /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(file) {
-        var uploadType, formData, response, data, dataValue, fileUrl, fileFormat, resolution, _t;
+      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(file, uploadType) {
+        var formData, response, data, dataValue, fileUrl, fileFormat, resolution, _t;
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.p = _context6.n) {
             case 0:
-              if (file) {
+              if (!(!file || !uploadType)) {
                 _context6.n = 1;
                 break;
               }
               return _context6.a(2);
             case 1:
-              uploadType = currentUploadType.current;
-              setUploadingType(uploadType);
+              setUploadingTypes(function (prev) {
+                return _objectSpread2(_objectSpread2({}, prev), {}, _defineProperty({}, uploadType, (prev[uploadType] || 0) + 1));
+              });
               _context6.p = 2;
               _context6.n = 3;
               return ensureSingleMaterialId();
@@ -6876,16 +6887,23 @@
               });
             case 11:
               _context6.p = 11;
-              setUploadingType(null);
-              currentUploadType.current = null;
-              if (fileInputRef.current) fileInputRef.current.value = '';
+              setUploadingTypes(function (prev) {
+                var next = _objectSpread2({}, prev);
+                var remaining = (next[uploadType] || 1) - 1;
+                if (remaining > 0) {
+                  next[uploadType] = remaining;
+                } else {
+                  delete next[uploadType];
+                }
+                return next;
+              });
               return _context6.f(11);
             case 12:
               return _context6.a(2);
           }
         }, _callee6, null, [[2, 10, 11, 12]]);
       }));
-      return function handleUpload(_x4) {
+      return function handleUpload(_x4, _x5) {
         return _ref7.apply(this, arguments);
       };
     }();
@@ -6920,9 +6938,12 @@
     var handleFileChange = function handleFileChange(e) {
       var files = e.target.files;
       var selectedFile = files && files[0];
+      var uploadType = currentUploadType.current;
+      currentUploadType.current = null;
+      e.target.value = '';
       if (selectedFile) {
         if (validateImageFile(selectedFile)) {
-          handleUpload(selectedFile);
+          handleUpload(selectedFile, uploadType);
         }
       }
     };
@@ -7131,7 +7152,7 @@
           }
         }, _callee8);
       }));
-      return function uploadBatchChannelFile(_x5) {
+      return function uploadBatchChannelFile(_x6) {
         return _ref9.apply(this, arguments);
       };
     }();
@@ -7250,7 +7271,7 @@
           }
         }, _callee9, null, [[3, 8, 9, 10]]);
       }));
-      return function handleBatchChannelFileChange(_x6) {
+      return function handleBatchChannelFileChange(_x7) {
         return _ref0.apply(this, arguments);
       };
     }();
@@ -7338,7 +7359,7 @@
           }
         }, _callee0, null, [[3, 9, 10, 11]]);
       }));
-      return function handleUploadBatchMultiFiles(_x7, _x8) {
+      return function handleUploadBatchMultiFiles(_x8, _x9) {
         return _ref1.apply(this, arguments);
       };
     }();
@@ -7379,7 +7400,7 @@
           }
         }, _callee1);
       }));
-      return function handleBatchMultiDrop(_x9) {
+      return function handleBatchMultiDrop(_x0) {
         return _ref10.apply(this, arguments);
       };
     }();
@@ -7525,7 +7546,7 @@
           }
         }, _callee11, null, [[1, 3]]);
       }));
-      return function handleAddBatchOneFiles(_x0) {
+      return function handleAddBatchOneFiles(_x1) {
         return _ref12.apply(this, arguments);
       };
     }();
@@ -7641,7 +7662,7 @@
 
     // Render reference image upload area
     var renderRefUploadArea = function renderRefUploadArea() {
-      var isUploading = uploadingType === 'reference';
+      var isUploading = !!uploadingTypes.reference;
       var hasImage = referenceImage && referenceImage.url;
       var isDisabled = false;
 
@@ -7701,7 +7722,7 @@
 
     // Render single PBR map upload area
     var renderPbrUploadArea = function renderPbrUploadArea(pbrType) {
-      var isUploading = uploadingType === pbrType.key;
+      var isUploading = !!uploadingTypes[pbrType.key];
       var imageData = pbrMaps[pbrType.key];
       var isDragging = isDraggingPbr[pbrType.key] || false;
       var isDisabled = false;
@@ -62705,15 +62726,15 @@
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: styles$l.modelIcon
         }, /*#__PURE__*/React__default['default'].createElement("img", {
-          src: currentMaterial.assetType === '3D模型' ? fileLogo : currentMaterial.referenceImage,
+          src: currentMaterial.assetType === '3D模型' ? currentMaterial.modelThumbnail || fileLogo : currentMaterial.referenceImage,
           alt: "3D",
           className: styles$l.modelLogo
         })), /*#__PURE__*/React__default['default'].createElement("div", {
           className: styles$l.modelDetail
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: styles$l.modelName,
-          title: currentMaterial.modelName
-        }, currentMaterial.modelName), currentMaterial.assetType === '3D模型' ? /*#__PURE__*/React__default['default'].createElement("div", {
+          title: currentMaterial.name
+        }, currentMaterial.name), currentMaterial.assetType === '3D模型' ? /*#__PURE__*/React__default['default'].createElement("div", {
           className: styles$l.modelMeta,
           title: "".concat(currentMaterial.fileFormat, "/").concat(currentMaterial.fileSize)
         }, currentMaterial.fileFormat, "/", currentMaterial.fileSize) : /*#__PURE__*/React__default['default'].createElement("div", {
@@ -62747,12 +62768,13 @@
           if (detail) {
             this.setState({
               currentMaterial: {
-                modelName: detail.modelName || '-',
+                name: detail.name || '-',
                 fileFormat: detail.fileFormat,
                 fileSize: formatFileSize$1(detail.fileSize),
                 referenceImage: detail.referenceImage || "",
                 resolution: detail.resolution || "",
-                assetType: detail.assetType || ""
+                assetType: detail.assetType || "",
+                modelThumbnail: detail.modelThumbnail
               }
             });
           }