diff --git a/template.js b/template.js index 533a7addce2572cda15000268a4323f17fa7de6a..5e158a2ae12042adddc246c4cb22163d9468d356 100644 --- a/template.js +++ b/template.js @@ -56,13 +56,11 @@ var GUI = gui_piug.newGui(gui_piug.__dirname); var PAR = {}; if ($.par) { PAR = $.par } else if ($.hasOwnProperty('script_parameter')) { PAR = JSON.parse($.script_parameter); } if (mode === "aimdfm") { - var database = require("topsin.database"); - database.addConnection($.conf.database_conf, "DFM"); - var QDfm = database.query("DFM"); - $.QDfm = QDfm; - if ($.conf.product_type == "aimdfm") { - QDfm.updateRow({ table: "pdm_aimdfm_task", data: { current_process_title: $.process_title }, where: { id: $.task_id } }); - } + IKM.crud("updateRow", { + table: "pdm_aimdfm_task", + data: { current_process_title: $.process_title }, + where: { id: $.task_id } + }) } var Status = 'ok'; var resultData = []; @@ -94,55 +92,13 @@ try { } // 主体 - var stepList = GEN.getStepList({job:job}) // 工作step列表 stepList = stepList.filter(function(step){ var reg = new RegExp(par.step,"ig"); return reg.test(step); }) - var verification = function(size) { - return size <= 500 - } - - var drills = getLayer({layer_type:"drill",name:"drl"}) - - stepList.forEach(function(step) { - GEN.openStep({ job: job, name: step }); - GEN.clearLayers(); //清除层显示 - GEN.affectedLayer({ mode: 'all', affected: 'no' }); //设置影å“层全部ä¸å½±å“ - GEN.COM("sel_options,clear_mode=clear_after,display_mode=all_layers,area_inout=inside,area_select=select,select_mode=standard,area_touching_mode=exclude"); - GEN.units({ type: par.units }); //å•ä½åˆå§‹åŒ– - GEN.zoomHome(); //çª—å£æ˜¾ç¤ºå›žåˆ°åŽŸå§‹ä½ç½® - GEN.selClearFeature() - drills.forEach(function(drl) { - GEN.workLayer({name:drl,display_number:2,clear_before:'yes'}) - var sys = GEN.getLayerSymsHist({job:Job,step:'net',layer:drl,units:'mm'}) - var includesys = []; - // r700":{"symbol":"r700","line":"0","pad":"400","arc":"0","size":"700"}, - Object.keys(sys).forEach(function(key){ - var symbolinfo = sys[key]; - if(!symbolinfo.size && symbolinfo.width){ - symbolinfo.size = symbolinfo.width > symbolinfo.height ? symbolinfo.width : symbolinfo.height; - } - if(symbolinfo.size){ - symbolinfo.size = symbolinfo.size - 0; - if(verification(symbolinfo.size)){ - includesys.push(symbolinfo.symbol) - } - } - }) - if(includesys.length){ - GEN.selectByFilter({include_syms:includesys.join(";")}) - if(GEN.getSelectCount()>0){ - GEN.COM("cur_atr_set,attribute=.drill,option=via") - GEN.COM("sel_change_atr,mode=add") - } - } - }) - }) - - + @@ -157,7 +113,11 @@ try { // 结尾返回 固定写法 var Return = "Done" if (mode === "aimdfm") { - $.QDfm.updateRow({ table: "pdm_aimdfm_task", data: { progress: 100 }, where: { id: $.task_id } }); + IKM.crud("updateRow", { + table: "pdm_aimdfm_task", + data: { progress: 100 }, + where: { id: $.task_id } + }) var tmperr = { type: "info", title: "æ“作完æˆ, è¯·æ³¨æ„æ£€æŸ¥!" } if (GEN.hasError()) { Status = 'error'; @@ -177,8 +137,8 @@ try { return (mode === "aimdfm") ? { status: Status, result_data: resultData } : "Error"; } - - +// 获å–层别 +// func (Object) ([]string) function getLayer(props){ // 获å–层 if (!props) { return @@ -191,11 +151,18 @@ function getLayer(props){ // 获å–层 var info = matrix[b]; var ret = true; for (var key in props) { - if (!Array.isArray(props[key])) { - props[key] = [props[key]] - } - if (info[key] && props[key].indexOf(info[key]) < 0) { - ret = false + if (info[key]) { + if(/string/ig.test(typeof props[key])){ + var reg = new RegExp(props[key],"ig") + if(!reg.test(info[key])){ + ret = false + } + } + if(/function/ig.test(typeof props[key])){ + if(!props[key](info[key])){ + ret = false + } + } } } if (ret) {