daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布v2.6.8版本

Browse Source
This commit is contained in:
雨中磐石
2025-03-31 20:54:32 +08:00
parent 0701e2a8b4
commit d41bd27082
122 changed files with 9827 additions and 9132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webmain/main/flow/flowAction.php
View File

@@ -720,7 +720,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$tablesn = explode(',', $mrs['names']);
foreach($tablesa as $k=>$tab){
$str = m('input')->getsubtable($modeid, $k+1, 1);
$s.='<tr ><td class="ys2" style="background-color:#CCCCCC;" colspan="4"><strong>'.arrvalue($tablesn, $k).'</strong></td></tr>';
$s.='<tr ><td class="ys2 zbtitle" colspan="4"><strong>'.arrvalue($tablesn, $k).'</strong></td></tr>';
$s.='<tr><td class="ys0" colspan="4">'.$str.'</td></tr>';
}
}
@@ -808,7 +808,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$narr['modename'] = $this->moders['name'];
$narr['table'] = $this->moders['table'];
$narr['optdt'] = arrvalue($rs,'optdt');
$nors = $flow->flowrsreplace($rs, 2);
$nors = $flow->rsreplace($rs, 2, null, 1);
$narr['summary'] = $this->rock->reparr($this->moders['summary'], $nors);
$otehsr = '';
if($flow->isflow>0){
@@ -911,7 +911,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$fiesss = substr($fields,0,5);
if($fiesss == 'base_' || $fiesss == 'temp_')return;
if(!isempt($tables) && $cans['islu']==1){
$_fieldsa = $this->db->gettablefields('[Q]'.$tables.'');$allfields = array();
$_fieldsa = $this->db->gettablefields('[Q]'.$tables.'');$allfields = array();$this->rock->debugs($_fieldsa,'fields');
foreach($_fieldsa as $k2=>$rs2)$allfields[$rs2['name']] = $rs2;
$this->createfields($allfields, $tables, $fields, $type, $lens, $dev, $name);
if(substr($type,0,6)=='change' && !isempt($data)){
@@ -1087,7 +1087,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
m('log')->addlog('模块','清空模块['.$name.']的数据');
}
$this->db->query("alter table `[Q]$table` AUTO_INCREMENT=1");
//$this->db->query("alter table `[Q]$table` AUTO_INCREMENT=1");
return 'ok';
}
@@ -1645,4 +1645,13 @@ return array(
}
return $arr;
}
public function opentixingAjax()
{
$fields = $this->get('fields');
if(c('check')->onlynumber($fields))return '错误';
$value = (int)$this->get('value');
m('flow_set')->update("`$fields`='$value'", 'id>0');
return '处理成功';
}
}

4
webmain/main/flow/rock_flow_todoedit.php
View File

@@ -138,11 +138,11 @@ $(document).ready(function(){
<tr id="changefields{rand}" style="display:none">
<td align="right" nowrap >变化字段(可多选)：<br><font color="#888888">来自[表单元素管理]</font><font color=white>：</font></td>
<td class="tdinput"><select multiple name="changefields" size="8" class="form-control"></select></td>
<td class="tdinput"><select multiple style="height:100px;overflow:auto" name="changefields" size="8" class="form-control"></select></td>
</tr>
<tr id="changecourse{rand}" style="display:none">
<td align="right" nowrap >处理的步骤(可多选)：<br><font color="#888888">来自[流程审核步骤]</font><font color=white>：</font></td>
<td class="tdinput"><select multiple name="changecourse" size="5" class="form-control"></select></td>
<td class="tdinput"><select multiple style="height:100px;overflow:auto" name="changecourse" size="5" class="form-control"></select></td>
</tr>
<tr>

30
webmain/main/flow/rock_flow_view.php
View File

@@ -46,6 +46,10 @@ $(document).ready(function(){
modeid=v;
a.setparams({modeid:v},true);
},
changemodes:function(v){
modeid=v;
a.setparams({modeid:v},true);
},
del:function(){
a.del({
url:js.getajaxurl('delmodeshuju','{mode}','{dir}'),
@@ -59,24 +63,13 @@ $(document).ready(function(){
openviewlog:function(id){
var d = a.getData(id);
addtabs({name:'['+d.id+'.'+d.modename+']操作记录','num':''+d.modenum+''+d.id+'',url:'main,flow,viewlog,modenum='+d.table+',mid='+d.id+''});
},
xuanmode:function(o1){
js.selectmode(o1, get('modes_{rand}'), function(sna,val,d){
c.changemodes(val);
});
}
};
$('#mode_{rand}').change(c.changemode);
$.get(js.getajaxurl('getmodearr','{mode}','{dir}'),function(str){
var d=js.decode(str);
var s = '<option value="0">-选择模块-</option>',len=d.data.length,i,csd,types='';
for(i=0;i<len;i++){
csd = d.data[i];
if(types!=csd.type){
if(types!='')s+='</optgroup>';
s+='<optgroup label="'+csd.type+'">';
}
s+='<option value="'+csd.id+'">'+csd.name+'</option>';
types = csd.type;
}
$('#mode_{rand}').html(s);
});
js.initbtn(c);
openlogs{rand}=function(id){
c.openviewlog(id);
@@ -88,7 +81,10 @@ $(document).ready(function(){
<table width="100%">
<tr>
<td align="left">
<select style="width:180px" id="mode_{rand}" class="form-control" ><option value="0">-选择模块-</option></select>
<div class="btn-group" style="width:260px;" click="xuanmode">
<input class="input" placeholder="-选择模块-" style="flex:1" id="modes_{rand}" readonly>
<button class="webbtn webbtn-default">v</button>
</div>
</td>
<td align="left" style="padding:0px 10px;">

5
webmain/main/flow/tpl_flow_input.html
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title><?=$da['title']?>-<?=TITLE?></title>
<link rel="stylesheet" href="webmain/css/css.css" />
<link rel="stylesheet" href="webmain/css/rock.css?<?=time()?>" />
<link rel="stylesheet" href="mode/kindeditor/themes/default/default.css" />
<link rel="shortcut icon" href="favicon.ico" />
<script type="text/javascript" src="js/jquery.js"></script>
@@ -139,6 +139,9 @@ select{font-size:12px}
#page_left div{text-align:left;padding:5px 10px;cursor:pointer}
#page_left div:hover{ background-color:#f1f1f1;color:#225DE8}
</style>
<?php
echo c('color')->getApptheme(false);
?>
</head>
<body>
<div align="center">

5
webmain/main/flow/tpl_flow_inputzs.html
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title><?=$da['title']?>-<?=TITLE?></title>
<link rel="stylesheet" href="webmain/css/css.css" />
<link rel="stylesheet" href="webmain/css/rock.css?<?=time()?>" />
<link rel="stylesheet" href="mode/kindeditor/themes/default/default.css" />
<link rel="shortcut icon" href="favicon.ico" />
<script type="text/javascript" src="js/jquery.js"></script>
@@ -115,6 +115,9 @@ select{font-size:12px}
#page_left div{text-align:left;padding:5px 10px;cursor:pointer}
#page_left div:hover{ background-color:#f1f1f1;color:#225DE8}
</style>
<?php
echo c('color')->getApptheme(false);
?>
</head>
<body>
<div align="center">