zhangweicheng 6 éve
szülő
commit
d460832379

+ 1 - 1
web/building_saas/css/custom.css

@@ -261,9 +261,9 @@ legend.legend{
 .item_spread{
     width: 29.8%;
     float: left;
-    white-space:nowrap;
     margin-top: -5px;
     background: #F1F1F1;
+    word-wrap:break-word
 }
 
 input.text-right{

+ 1 - 1
web/building_saas/main/html/main.html

@@ -194,7 +194,7 @@
                                       <div class="main-data-bottom ovf-hidden" id="subSpread" style="display: none" tabindex="0"></div>
                                       <div class="main-data-bottom ovf-hidden" id="rgResize" style="width: 0.2%; height: 100%; resize:horizontal; cursor: w-resize; float: left; background: #F1F1F1;display: none"></div>
                                       <div class="item_spread main-data-bottom ovf-hidden " id="replaceM" style="display: none" >
-                                          <div class="p-0" id="openItemText" style="height:100%;white-space:normal;width: 40px">
+                                          <div class="p-0" id="openItemText" style="height:100%;width: 40px">
                                               <div class="tn-nav d-flex align-items-start flex-column" data-toggle="tooltip" data-placement="left" title="" data-original-title="打开项目特征">
                                                   <span class="mt-3 ml-2 text-primary">项目特征</span>
                                                   <i class="fa fa-arrow-left mt-auto mb-3 text-primary ml-2"></i>

+ 6 - 1
web/building_saas/main/js/views/quantity_edit_view.js

@@ -220,7 +220,12 @@ let quantityEditObj = {
             evalString = replaceAll("QDL","("+bQuantity+")",evalString);
         }
         try {
-            let value = eval(evalString);
+            let value = undefined;
+            if(evalString&&evalString!=""){
+                let exp = new Expression('');
+                exp.Expression(evalString);
+                value = Number(exp.Evaluate());
+            }
             return value;
         }catch (error){
             alert("输入的表达式有误,请重新输入!");