Merge branch 'master' of http://smartcost.f3322.net:3000/caiaolin/Calculation

app/public/js/change.js

@@ -103,31 +103,18 @@ class codeRuleSet {
             const connectorType = connectorRule !== '' && parseInt(connectorRule) !== 3 ? ruleConst.connectorString[connectorRule] : '';
             const previewtext = $.trim($('#preview', obj).text()) === '' ? preview : $.trim($('#preview', obj).text()) + connectorType + preview;
             $('#preview', obj).text(previewtext);
-
-            $('a', part).bind('click', function () {
-                const index = $('a', obj).index(this);
-                codeRule.splice(index, 1);
-                $(this).parent().remove();
-                const rules = $('span>span', obj), ruleText = [];
-                for (const r of rules) {
-                    ruleText.push($.trim(r.innerText));
-                }
-                const connectorType = connectorRule !== '' && parseInt(connectorRule) !== 3 ? ruleConst.connectorString[connectorRule] : '';
-                $('#preview', obj).text(ruleText.join(connectorType));
-            });
         });
         // 删除规则组件
-        $('a', $('#ruleParts', obj)).bind('click', function () {
+        $($('#ruleParts', obj)).on('click', 'a', function () {
             const index = $('a', obj).index(this);
-            codeRule.splice(index, 1);
+            codeRule.splice(index-1, 1);
+            console.log(index);
             $(this).parent().remove();
             const rules = $('span>span', obj), ruleText = [];
             for (const r of rules) {
                 ruleText.push($.trim(r.innerText));
             }
-            // const connectorType = $('.connector-change', obj).val() !== null || $('.connector-change', obj).val() === '3' ? $('.connector-change option:selected', obj).text() : '';
             const connectorType = connectorRule !== '' && parseInt(connectorRule) !== 3 ? ruleConst.connectorString[connectorRule] : '';
-            console.log(connectorType);
             $('#preview', obj).text(ruleText.join(connectorType));
         });
     }
@@ -230,5 +217,4 @@ $(document).ready(() => {
     $('.delete-cid-modal').on('click', function () {
         $('#delete-cid').val($(this).attr('cid'));
     });
-
 });