查找引用bug

modules/std_glj_lib/models/gljModel.js

@@ -7,6 +7,7 @@ const gljModel = mongoose.model('std_glj_lib_gljList');
 const gljClassModel = mongoose.model('std_glj_lib_gljClass');
 const compilationModel = mongoose.model('compilation');
 const scMathUtil = require('../../../public/scMathUtil').getUtil();
+const rationMapModel = mongoose.model('std_ration_lib_map');
 const rationModel = mongoose.model('std_ration_lib_ration_items');
 const complementaryRationModel = mongoose.model('complementary_ration_items');
 import {OprDao} from  "./gljMapModel";
@@ -17,10 +18,10 @@ import async from "async";
 class GljDao  extends OprDao{
     async getReference(repositoryId, gljId) {
         const gljLib = await gljMapModel.findOne({ID: repositoryId});
-        const rationLibIds = [];
+        const rationLibIds = gljLib.rationLibs.map(lib => lib.ID);
+        const rationLibs = await rationMapModel.find({ID: {$in: rationLibIds}}, '-_id ID dispName');
         const rationLibNameMapping = {};
-        gljLib.rationLibs.forEach(item => {
-            rationLibIds.push(item.ID);
+        rationLibs.forEach(item => {
             rationLibNameMapping[item.ID] = item.dispName;
         });
         const stdRations = await rationModel.find({rationRepId: {$in: rationLibIds}, 'rationGljList.gljId': gljId}, '-_id code rationRepId');

public/common_util.js

@@ -23,7 +23,7 @@ function deleteEmptyObject(arr) {
     if (typeof module !== 'undefined') {
         module.exports = factory();
     } else {
-        window._commonUtil = factory();
+        window.commonUtil = factory();
     }
 })(() => {
     function isDef(val) {

web/maintain/project_feature_lib/html/edit.html

@@ -27,11 +27,6 @@
     </div>
 </div>
 
-
-
-<script type="text/javascript">
-
-</script>
 <script type="text/javascript" src="/lib/json/json2.js"></script>
 <script src="/public/web/lock_util.js"></script>
 <script type="text/javascript" src="/web/maintain/project_feature_lib/js/project_feature_edit.js"></script>

web/maintain/ration_repository/dinge.html

@@ -654,6 +654,7 @@
         <script type="text/javascript" src="/web/maintain/ration_repository/js/global.js"></script>
         <script src="/public/web/lock_util.js"></script>
         <script src="/public/web/PerfectLoad.js"></script>
+        <script src="/public/common_util.js"></script>
         <!-- zTree -->
         <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
         <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
@@ -664,7 +665,6 @@
         <script type="text/javascript" src="/web/maintain/ration_repository/js/annotation.js"></script>
         <script type="text/javascript" src="/public/web/scMathUtil.js"></script>
         <script type="text/javascript" src="/public/web/common_ajax.js"></script>
-        <script src="/public/common_util.js"></script>
         <script type="text/javascript" src="/public/web/id_tree.js"></script>
         <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
         <script src="/public/web/tree_sheet/tree_sheet_helper.js"></script>

web/maintain/ration_repository/js/installation.js

@@ -466,7 +466,7 @@ let sectionObj = {
                             "ref": {
                                 name: "批量关联至定额",
                                 disabled: function () {
-                                    const inValidCell = !_commonUtil.isDef(target.row) || !_commonUtil.isDef(target.col);
+                                    const inValidCell = !commonUtil.isDef(target.row) || !commonUtil.isDef(target.col);
                                     const inValidData = target.row >= me.cache.length;
                                     return locked || inValidCell || inValidData;
                                 },

web/maintain/ration_repository/js/ration.js

@@ -265,7 +265,7 @@ let rationOprObj = {
                             "delete": {
                                 name: "删除",
                                 disabled: function () {
-                                    const inValidCell = !_commonUtil.isDef(target.row) || !_commonUtil.isDef(target.col);
+                                    const inValidCell = !commonUtil.isDef(target.row) || !commonUtil.isDef(target.col);
                                     const inValidData = !cacheSection ||target.row >= cacheSection.length;
                                     return locked || inValidCell || inValidData;
                                 },

web/maintain/ration_repository/js/ration_glj.js

@@ -292,7 +292,7 @@ var rationGLJOprObj = {
                             "add": {
                                 name: "添加人材机",
                                 disabled: function () {
-                                    const inValidCell = !_commonUtil.isDef(target.row) || !_commonUtil.isDef(target.col);
+                                    const inValidCell = !commonUtil.isDef(target.row) || !commonUtil.isDef(target.col);
                                     if (locked || inValidCell || !me.currentRationItem) {
                                         return true;
                                     }
@@ -314,7 +314,7 @@ var rationGLJOprObj = {
                             "delete": {
                                 name: "删除人材机",
                                 disabled: function () {
-                                    const inValidCell = !_commonUtil.isDef(target.row) || !_commonUtil.isDef(target.col);
+                                    const inValidCell = !commonUtil.isDef(target.row) || !commonUtil.isDef(target.col);
                                     const rationGlj =  me.cache['_GLJ_' + me.currentRationItem.ID];
                                     const inValidData = !rationGlj || target.row >= rationGlj.length;
                                     if (locked || inValidCell || !me.currentRationItem || inValidData) {
@@ -345,7 +345,7 @@ var rationGLJOprObj = {
                             "upMove": {
                                 name: "上移",
                                 disabled: function () {
-                                    const inValidCell = !_commonUtil.isDef(target.row) || !_commonUtil.isDef(target.col);
+                                    const inValidCell = !commonUtil.isDef(target.row) || !commonUtil.isDef(target.col);
                                     const inValidData = target.row >= currentCache.length || !raCoe.isDef(currentCache[target.row - 1]);
                                     return locked || inValidCell || inValidData
                                 },
@@ -357,7 +357,7 @@ var rationGLJOprObj = {
                             "downMove": {
                                 name: "下移",
                                 disabled: function () {
-                                    const inValidCell = !_commonUtil.isDef(target.row) || !_commonUtil.isDef(target.col);
+                                    const inValidCell = !commonUtil.isDef(target.row) || !commonUtil.isDef(target.col);
                                     const inValidData = target.row >= currentCache.length || !raCoe.isDef(currentCache[target.row + 1]);
                                     return locked || inValidCell || inValidData;
                                 },
@@ -369,7 +369,7 @@ var rationGLJOprObj = {
                             "ref": {
                                 name: "添加到本节其他定额",
                                 disabled: function () {
-                                    const inValidCell = !_commonUtil.isDef(target.row) || !_commonUtil.isDef(target.col);
+                                    const inValidCell = !commonUtil.isDef(target.row) || !commonUtil.isDef(target.col);
                                     const inValidData = target.row >= currentCache.length;
                                     return locked || inValidCell || inValidData;
                                 },

web/maintain/ration_repository/js/ration_template.js

@@ -13,15 +13,12 @@
 
 const RationTemplate = (function () {
     let curRation = null;
-    function _isDef(v) {
-        return typeof v !== 'undefined' && v !== null;
-    }
     //当前定额下的定额模板关联数据
     let templateData = [];
     let templateSheet = null;
     //重新设置templateData
     function setTemplateData(newData) {
-        templateData = _isDef(newData) && Array.isArray(newData) ? newData : [];
+        templateData = commonUtil.isDef(newData) && Array.isArray(newData) ? newData : [];
     }
     let setting = {
         header:[

web/maintain/std_glj_lib/js/gljComponent.js

@@ -260,7 +260,6 @@ let gljComponentOprObj = {
         me.workBook.commandManager().setShortcutKey('gljComponentDel', GC.Spread.Commands.Key.del, false, false, false, false);
     },
     onContextmenuOpr: function () {
-        const locked = lockUtil.getLocked();
         let me = gljComponentOprObj, that = repositoryGljObj, co = componentOprObj;
         $.contextMenu({
             selector: '#gljComponentSheet',