Browse Source

1.修复选中区域计算的bug
2.调整特征添加规则的行距

olym 7 years atrás
parent
commit
0370641d1e

+ 1 - 1
web/building_saas/main/js/views/project_view.js

@@ -628,7 +628,7 @@ var projectObj = {
         let y = window.event.clientY;
 
         // 匹配数字或小数
-        const regular = /^([0-9]+[.]{1}[0-9]+)$|^([1-9]{1}\d+)$/;
+        const regular = /^([0-9]+[.]{1}[0-9]+)$|^([1-9]{1}\d*)$/;
         // 小数点最高位数
         let max = 0;
         let total = 0;

+ 1 - 0
web/building_saas/main/js/views/sub_view.js

@@ -101,6 +101,7 @@ $("#linkTZJNR").click(function () {
     $("#subItems").children().hide();
     $("#tzjnrCon").show();
     $("#add-rule").show();
+    $("#add-rule p").not(":first").css('margin-bottom', 4);
     pageCCOprObj.active = true;
     refreshSubSpread();
     let selectedNode = projectObj.mainController.tree.selected;