@leevan/jtui 2.0.17 → 2.0.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/examples/data2.js +10 -0
  2. package/examples/tableTest/table-ptbg.vue +4 -4
  3. package/lib/jtui.common.js +21 -9
  4. package/lib/jtui.umd.js +21 -9
  5. package/lib/jtui.umd.min.js +1 -1
  6. package/package.json +1 -1
  7. package/packages/jt-table/index.vue +29 -5
  8. package/packages/jt-table-pc/data2.js +26 -5
package/examples/data2.js CHANGED
@@ -1,6 +1,16 @@
1
+ /*
2
+ * @Author: leevan
3
+ * @Date: 2022-03-15 21:52:59
4
+ * @LastEditTime: 2022-04-18 14:39:37
5
+ * @LastEditors: leevan
6
+ * @FilePath: /jtui-pc/examples/data2.js
7
+ */
1
8
  export function data(){
2
9
  return [{"retjson":{"isEnums":true,"isHaveHead":true,"header":[{"isSort":false,"prop":"name","width":240,"label":"名称","type":"String","align":"left","enum":[]},{"isSort":false,"prop":"path","width":0,"label":"path","type":"String","align":"","enum":[]},{"isSort":false,"prop":"pjcd","width":120,"label":"拟报标志","type":"String","align":"center","cellRender":"TabsBtn","enum":[]}],"isPages":false},"DataArray":[{"path":"NB_ADDVCD_DS?nbcode=/srdao/sqdb/ST_PPTN_05&stlbz=T","inBottons":[{"funcode":"stcd_ppcdreflash","color":"#409EFF","size":14,"name":"刷新","icon":"iconzengjia"},{"funcode":"stcd_search","color":"#409EFF","size":14,"name":"检索","icon":"iconzengjia"}],"name":"实时雨量（PN05）-[/srjtcontrol/nb/PN05ToPPTN]","pjcd":""},{"path":"NB_ADMAUTH?nbcode=/srdao/sqdb/RM_PF5&stlbz=P","inBottons":[{"funcode":"stcd_ppcdreflash","color":"#409EFF","size":14,"name":"刷新","icon":"iconzengjia"},{"funcode":"stcd_search","color":"#409EFF","size":14,"name":"检索","icon":"iconzengjia"}],"name":"累计雨量（PF5）-[/srjtcontrol/nb/PF5ToDB]","pjcd":""},{"path":"NB_ADMAUTH?nbcode=/srdao/sqdb/ST_RIVER_05&stlbz=T","inBottons":[{"funcode":"stcd_ppcdreflash","color":"#409EFF","size":14,"name":"刷新","icon":"iconzengjia"},{"funcode":"stcd_search","color":"#409EFF","size":14,"name":"检索","icon":"iconzengjia"}],"name":"水位流量(RIVER05)-[/srjtcontrol/nb/ZQToRiver]","pjcd":""},{"path":"NB_ADMAUTH?nbcode=/srdao/sqdb/ST_RSVR_R&stlbz=T","inBottons":[{"funcode":"stcd_ppcdreflash","color":"#409EFF","size":14,"name":"刷新","icon":"iconzengjia"},{"funcode":"stcd_search","color":"#409EFF","size":14,"name":"检索","icon":"iconzengjia"}],"name":"水库水情表(RSVR05)-[/srjtcontrol/nb/ZToRSVR]","pjcd":""},{"path":"NB_ADMAUTH?nbcode=/srdao/sqdb/ST_SOIL_R&stlbz=T","inBottons":[{"funcode":"stcd_ppcdreflash","color":"#409EFF","size":14,"name":"刷新","icon":"iconzengjia"},{"funcode":"stcd_search","color":"#409EFF","size":14,"name":"检索","icon":"iconzengjia"}],"name":"土壤墒情表-[/srjtcontrol/nb/MToSOIL]","pjcd":""},{"path":"NB_STLIST?admauth=none&pjcd=none&addvcd=none&nbcode=/SX/BV&stlbz=L","inBottons":[{"funcode":"stcd_ppcdreflash","color":"#409EFF","size":14,"name":"刷新","icon":"iconzengjia"},{"funcode":"stcd_search","color":"#409EFF","size":14,"name":"检索","icon":"iconzengjia"}],"name":"三峡遥测电压-[/srjtcontrol/sx/BVToSXRTSQ]","pjcd":""},{"path":"NB_STLIST?admauth=none&pjcd=none&addvcd=none&nbcode=/SX/PF5&stlbz=L","inBottons":[{"funcode":"stcd_ppcdreflash","color":"#409EFF","size":14,"name":"刷新","icon":"iconzengjia"},{"funcode":"stcd_search","color":"#409EFF","size":14,"name":"检索","icon":"iconzengjia"}],"name":"三峡遥测累计雨量-[/srjtcontrol/sx/PF5ToSXRTSQ]","pjcd":""}],"forms":[{"oprtype":"modify","submit":"/dbacc/test-app/39409a71d7d8bfdba778013749cf6730fa93ee98ad3c38b51bd3dd3e1a6f07c6/883A146DF81C76D9A22858721A45353B/sqrms_ycnb/","data":[],"display":false,"index":1,"showtype":"el-dialog","pagemodal":"step","Pages":[{"pagerule":"required","formtype":"JT_DEFAULT_FORM","formConfig":[{"disabled":false,"label":"nbcode","type":"empty","modelKey":"nbcode"},{"disabled":false,"label":"stcd","type":"empty","modelKey":"stcd"},{"disabled":false,"label":"pjcd","type":"empty","modelKey":"pjcd"}],"model":{"stcd":{},"nbcode":{},"pjcd":{}},"rules":{},"pagecode":"stcd_nb_0"}],"path":"IU","funcode":"stcd_nb","name":"测站拟报设置","width":"600","model":{}},{"Pages":[],"funcode":"stcd_ppcdreflash","oprtype":"Reflash","data":[],"display":false,"name":"刷新","width":"600","index":1,"model":{},"showtype":"el-dialog","pagemodal":"step"},{"oprtype":"modify","submit":"/dbacc/test-app/39409a71d7d8bfdba778013749cf6730fa93ee98ad3c38b51bd3dd3e1a6f07c6/883A146DF81C76D9A22858721A45353B/sqrms_ycnb/","data":[],"display":false,"index":1,"showtype":"el-dialog","pagemodal":"step","Pages":[{"pagerule":"required","formtype":"jt-form-pc","formConfig":[{"disabled":false,"label":"nbcode","type":"empty","modelKey":"nbcode"},{"disabled":false,"label":"stcd","type":"empty","modelKey":"stcd"},{"width":300,"defaultvalue":"","disabled":false,"label":"参数代码","placeholder":"请输入参数代码","type":"input","modelKey":"ppcdlist"}],"name":"测站拟报参数设置","labelWidth":200,"model":{"stcd":{},"nbcode":{},"ppcdlist":""},"rules":{},"pagecode":"stcd_ppcdlist_0"}],"path":"IU","funcode":"stcd_ppcdlist","name":"拟报参数","width":"600","model":{}},{"oprtype":"Search","submit":"/dbacc/test-app/65ddae9353688b639ee665a28da7e9ddfa91c372308a33fe8e0f899adf78637c/883A146DF81C76D9A22858721A45353B/sqrms_ycnb/","data":[],"display":false,"index":1,"showtype":"el-dialog","pagemodal":"step","Pages":[],"path":"NB_PJCD","funcode":"stcd_search","name":"检索","width":"600","model":{}}],"Result":7}]
3
10
  }
4
11
 
5
12
 
6
13
 
14
+ export function data1(){
15
+ return [{"retjson":{"isEnums":true,"inBottons":[{"funcode":"yczgzcspz_szz","color":"#d81e06","size":20,"name":"修改","icon":"edit-1-copy"}],"isHaveHead":true,"header":[{"isSort":true,"prop":"PPCD","width":80,"label":"参数代码","type":"String","align":"center"},{"isSort":true,"prop":"PPNM","width":200,"label":"参数名称","type":"String","align":"left"},{"isSort":true,"prop":"ZHXS","width":80,"label":"转换系数","type":"Decimal","align":"center"},{"isSort":false,"prop":"MINVL","width":80,"label":"最小值","type":"Decimal","align":"center"},{"isSort":false,"prop":"MAXVL","width":90,"label":"最大值","type":"Decimal","align":"center"},{"isSort":true,"prop":"PVLBZ","width":0,"label":"值标志","type":"String","align":"center"},{"isSort":false,"prop":"PVLBZ_SHOW","width":80,"label":"值标志","type":"String","align":"center"},{"isSort":true,"prop":"IS_WORK","width":0,"label":"是否工作参数","type":"String","align":"center"},{"isSort":true,"prop":"IS_REAL","width":0,"label":"是否实时数据","type":"String","align":"center"},{"isSort":true,"prop":"IS_GK","width":0,"label":"是否工况参数","type":"String","align":"center"},{"isSort":true,"prop":"IS_WORK_SHOW","width":80,"label":"是否工作参数","type":"String","align":"center"},{"isSort":true,"prop":"IS_REAL_SHOW","width":80,"label":"是否实时数据","type":"String","align":"center"},{"isSort":true,"prop":"IS_GK_SHOW","width":80,"label":"是否工况参数","type":"String","align":"center"}],"isPages":false,"isEnumsToTag":true},"DataArray":[{"MAXVL":99999,"ZHXS":0.1,"PPCD":"M10","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"0","PPNM":"10cm深度土壤含水率","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":100000,"ZHXS":0.001,"PPCD":"Q01","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"1号流量传感器流量值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":0.010,"PPCD":"ZT01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"1号水位传感器读数转换系数","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZA01","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"1号水位传感器发送控制标准-A","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZB01","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"1号水位传感器发送控制标准-B","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZC01","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"1号水位传感器发送控制标准-C","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZA01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"1号水位传感器发送时间间隔控制-A","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZB01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"1号水位传感器发送时间间隔控制-B","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZC01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"1号水位传感器发送时间间隔控制-C","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZD01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"1号水位传感器发送时间间隔控制-D","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZF01","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"1号水位传感器计算公式定义","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":6000,"ZHXS":0.01,"PPCD":"Z01","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"1号水位传感器水位值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZD01","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"1号水位发传感器送控制标准-D","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":99999,"ZHXS":0.1,"PPCD":"M20","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"0","PPNM":"20cm深度土壤含水率","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":100000,"ZHXS":0.001,"PPCD":"Q02","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"2号流量传感器流量值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1,"PPCD":"ZT02","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"2号水位传感器读数转换系数","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZA02","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"2号水位传感器发送控制标准-A","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZB02","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"2号水位传感器发送控制标准-B","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZC02","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"2号水位传感器发送控制标准-C","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZA02","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"2号水位传感器发送时间间隔控制-A","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZB02","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"2号水位传感器发送时间间隔控制-B","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZC02","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"2号水位传感器发送时间间隔控制-C","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"DZD02","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"2号水位传感器发送时间间隔控制-D","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"ZF02","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"2号水位传感器计算公式定义","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":6000,"ZHXS":0.01,"PPCD":"Z02","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"2号水位传感器水位值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"ZD02","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"2号水位发传感器送控制标准-D","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":100000,"ZHXS":0.001,"PPCD":"Q03","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"0","PPNM":"3号流量传感器流量值","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":6000,"ZHXS":0.01,"PPCD":"Z03","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"3号水位传感器水位值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"MAXVL":99999,"ZHXS":0.1,"PPCD":"M40","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"0","PPNM":"40cm深度土壤含水率","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":100000,"ZHXS":0.001,"PPCD":"Q04","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"4号流量传感器流量值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"MAXVL":6000,"ZHXS":0.01,"PPCD":"Z04","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"4号水位传感器水位值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"MAXVL":99999,"ZHXS":0.1,"PPCD":"PF5","PVLBZ_SHOW":"累计值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"R","IS_GK":"0","MINVL":0,"IS_REAL":"0","PPNM":"5分钟累雨量计值","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":36,"ZHXS":0.1,"PPCD":"PN05","PVLBZ_SHOW":"单点值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"P","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"5分钟雨量值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","PPCD":"CP4","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"GPRS优先级别","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","PPCD":"CP1","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"GSM短信优先级别","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"1","ZHXS":1.000,"PPCD":"SI1","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"GSM信号强度","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","PPCD":"CP3","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"PSTN优先级别","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"1","PPCD":"VER","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"RTU版本号","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"是","IS_WORK_SHOW":"否"},{"MAXVL":6000,"ZHXS":0.01,"PPCD":"Z11","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"Z11水位传感器水位值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"MAXVL":6000,"ZHXS":0.01,"PPCD":"Z12","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"L","IS_GK":"0","MINVL":0,"IS_REAL":"1","PPNM":"Z12水位传感器水位值","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"MAXVL":9999.000,"ZHXS":1.000,"PPCD":"DC","PVLBZ_SHOW":"累计值","IS_WORK":"0","IS_GK_SHOW":"是","PVLBZ":"R","IS_GK":"1","MINVL":0.000,"IS_REAL":"0","PPNM":"报文计数器","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"1","ZHXS":1.000,"PPCD":"SI2","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"北斗卫星信号强度","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","PPCD":"CP2","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"北斗卫星优先级别","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"NL","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"北纬","IS_WORK":"1","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"是"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"A01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"测流参数A","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"F01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"测流参数F","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"B","IS_GK":"0","ZHXS":1.000,"PPCD":"V01","PVLBZ_SHOW":"配置值","IS_REAL":"0","PPNM":"测流参数V","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V02","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速02","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V03","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速03","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V04","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速04","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V05","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速05","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V06","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速06","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V07","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速07","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V08","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速08","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.010,"PPCD":"V09","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"垂线流速09","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"CODE","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"代码标识","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":30,"ZHXS":0.1,"PPCD":"BV","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"是","PVLBZ":"L","IS_GK":"1","MINVL":0,"IS_REAL":"1","PPNM":"电池电压","IS_REAL_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"EL","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"东经","IS_WORK":"1","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"是"},{"PVLBZ":"C","IS_GK":"0","PPCD":"GSM1","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"短信目标地址-1","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"GSM2","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"短信目标地址-2","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"GSM3","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"短信目标地址-3","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"GSM4","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"短信目标地址-4","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":9999999.000,"ZHXS":1.000,"PPCD":"DI","PVLBZ_SHOW":"配置值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"B","IS_GK":"0","MINVL":0.000,"IS_REAL":"0","PPNM":"分包计数器","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"IT1","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"服务器IP目标地址-1","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"IT2","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"服务器IP目标地址-2","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"IT3","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"服务器IP目标地址-3","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"IT4","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"服务器IP目标地址-4","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"PT","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"服务器通讯端口","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"HOST1","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"服务器主机域名-1","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"HOST2","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"服务器主机域名-2","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"HOST3","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"服务器主机域名-3","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"RF","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"更新标志","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"1","ZHXS":0.100,"PPCD":"ET","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"环境温度","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"是","IS_WORK_SHOW":"否"},{"PVLBZ":"C","IS_GK":"0","PPCD":"PW","PVLBZ_SHOW":"配置串","IS_REAL":"0","PPNM":"密码关键字","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":999999,"ZHXS":1,"PPCD":"PWN","PVLBZ_SHOW":"累计值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"R","IS_GK":"0","MINVL":0,"IS_REAL":"0","PPNM":"密码序号","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"L","IS_GK":"0","ZHXS":0.100,"PPCD":"ED","PVLBZ_SHOW":"连续值","IS_REAL":"0","PPNM":"日蒸发量","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"P","IS_GK":"0","ZHXS":1,"PPCD":"MF","PVLBZ_SHOW":"单点值","MINVL":0.000,"IS_REAL":"0","PPNM":"数据存储器剩余量","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"P","IS_GK":"0","ZHXS":1,"PPCD":"ML","PVLBZ_SHOW":"单点值","IS_REAL":"0","PPNM":"数据存储器指针","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":30.000,"ZHXS":0.100,"PPCD":"SV","PVLBZ_SHOW":"连续值","IS_WORK":"0","IS_GK_SHOW":"是","PVLBZ":"L","IS_GK":"1","MINVL":0.000,"IS_REAL":"0","PPNM":"太阳能电压","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"PIC1","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"图片标识","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"NQ","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"土壤农情信息","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":99999,"ZHXS":0.1,"PPCD":"RC","PVLBZ_SHOW":"累计值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"R","IS_GK":"0","MINVL":0,"IS_REAL":"0","PPNM":"小时雨量累计值","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":9999.000,"ZHXS":1.00,"PPCD":"RD","PVLBZ_SHOW":"配置值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"B","IS_GK":"0","MINVL":0.000,"IS_REAL":"0","PPNM":"雨量传感器分辨力","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":9999.000,"ZHXS":1.00,"PPCD":"PI","PVLBZ_SHOW":"配置值","IS_WORK":"0","IS_GK_SHOW":"否","PVLBZ":"B","IS_GK":"0","MINVL":0.000,"IS_REAL":"0","PPNM":"雨量加报控制标准","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"DNS1","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"域名解析服务器-1","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"PVLBZ":"S","IS_GK":"0","PPCD":"DNS2","PVLBZ_SHOW":"字符串","IS_REAL":"0","PPNM":"域名解析服务器-2","IS_WORK":"0","IS_REAL_SHOW":"否","IS_GK_SHOW":"否","IS_WORK_SHOW":"否"},{"MAXVL":999999.000,"ZHXS":1.000,"PPCD":"CN","PVLBZ_SHOW":"累计值","IS_WORK":"0","IS_GK_SHOW":"是","PVLBZ":"R","IS_GK":"1","MINVL":0.000,"IS_REAL":"0","PPNM":"招测计数器","IS_REAL_SHOW":"否","IS_WORK_SHOW":"否"}],"Result":87}]
16
+ }
package/examples/tableTest/table-ptbg.vue CHANGED
@@ -99,7 +99,8 @@
99
99
  </template>
100
100
 
101
101
  <script>
102
- import { data23 , data13 } from '../../packages/jt-table-pc/data2';
102
+ import { data23 , data13,data7 ,data5} from '../../packages/jt-table-pc/data2';
103
+ import { data1 } from '../data2';
103
104
  export default {
104
105
  data(){
105
106
  return {
@@ -130,11 +131,11 @@ import { data23 , data13 } from '../../packages/jt-table-pc/data2';
130
131
  }
131
132
  },
132
133
  created(){
133
- const res = data23();
134
+ const res = data5();
134
135
  this.tableData[0].retjson = res[0].retjson;
135
136
  },
136
137
  mounted(){
137
- const res = data23();
138
+ const res = data5();
138
139
  let timeId = setTimeout(()=>{
139
140
  this.$refs.tablePtbg.loadData(res[0].DataArray);
140
141
  clearTimeout(timeId);
@@ -146,7 +147,6 @@ import { data23 , data13 } from '../../packages/jt-table-pc/data2';
146
147
  this.$refs.tablePtbg.exportTableData();
147
148
  },
148
149
  exportDataExcel(){
149
- debugger;
150
150
  this.$refs.tablePtbg.exportData({ type: 'csv' });
151
151
  },
152
152
  //导入数据
package/lib/jtui.common.js CHANGED
@@ -231258,7 +231258,7 @@ var es_function_name = __webpack_require__("b0c0");
231258
231258
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
231259
231259
  var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
231260
231260
 
231261
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/index.vue?vue&type=template&id=d9e605f2&
231261
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/index.vue?vue&type=template&id=66056588&
231262
231262
  var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tableStyle-2",class:_vm.isWrap ? 'isWrap' : '',staticStyle:{"position":"absolute","top":"1px","left":"1px","right":"1px","bottom":"1px"}},[(_vm.isTool)?_c('div',{staticStyle:{"position":"relative"}},[_c('vxe-toolbar',{staticClass:"jt-toolbar",attrs:{"custom":{ icon: 'jtIcon iconpeizhi41 colStyle' }}})],1):_vm._e(),(_vm.tableType === 'default')?_c('vxe-table',{ref:_vm.id,staticClass:"jt-table-class-only",attrs:{"height":"auto","size":"mini","show-overflow":"","show-header-overflow":"","auto-resize":"","resizable":"","highlight-current-row":"","highlight-current-column":"","keep-source":"","id":_vm.id,"data":_vm.data.DataArray,"stripe":_vm.stripe,"border":_vm.border,"max-height":_vm.maxHeight,"show-footer":_vm.isFooter,"footer-method":_vm.footerMethod,"footer-span-method":_vm.footerColspanMethod,"footer-cell-class-name":_vm.footerCellClassName,"loading":_vm.loading,"row-style":_vm.rowStyle,"cell-style":_vm.cellStyle_m,"header-cell-class-name":_vm.headerClass,"span-method":_vm.spanMethod,"scroll-y":{ mode: 'wheel' },"sort-config":{ sortMethod: _vm.sortMethod },"radio-config":{ checkRowKey: null },"keyboard-config":{ isArrow: true },"checkbox-config":{ highlight: true },"export-config":{
231263
231263
  type: 'xlsx',
231264
231264
  types: ['xlsx', 'csv', 'html', 'xml', 'txt'],
@@ -231358,7 +231358,7 @@ return [(_vm.handlerConfig.btnGroup)?_c('el-dropdown',[_c('el-button',{attrs:{"s
231358
231358
  var staticRenderFns = []
231359
231359
 
231360
231360
 
231361
- // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=d9e605f2&
231361
+ // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=66056588&
231362
231362
 
231363
231363
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
231364
231364
  var es_array_concat = __webpack_require__("99af");
@@ -232916,13 +232916,19 @@ var component = normalizeComponent(
232916
232916
  });
232917
232917
 
232918
232918
  return _item ? "<a href=\"javascript:\">".concat(cellValue, "</a>") : cellValue;
232919
+ } else if (data.htmlType == 'tag') {
232920
+ var _item2 = data.html.find(function (item) {
232921
+ return item.value == cellValue;
232922
+ });
232923
+
232924
+ return _item2 ? "<span style=\"\n display:inline-block;\n background-color: #fdf6ec;\n height: 26px;\n padding: 0 10px;\n line-height: 26px;\n font-size: 12px;\n color: #e6a23c;\n border: 1px solid #d9ecff;\n border-radius: 4px;\n box-sizing: border-box;\n white-space: nowrap;\n \">".concat(_item2.label, "</span>") : cellValue;
232919
232925
  }
232920
232926
  } else if (data && "enum" in data) {
232921
- var _item2 = data.enum.find(function (item) {
232927
+ var _item3 = data.enum.find(function (item) {
232922
232928
  return item.value == cellValue;
232923
232929
  });
232924
232930
 
232925
- return _item2 ? _item2.label : cellValue;
232931
+ return _item3 ? _item3.label : cellValue;
232926
232932
  } else {
232927
232933
  return cellValue;
232928
232934
  }
@@ -232946,14 +232952,20 @@ var component = normalizeComponent(
232946
232952
  var list = [];
232947
232953
 
232948
232954
  if (order === "asc" || order === "desc") {
232949
- if (/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property])) {
232955
+ if (/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property]) || /[a-zA-Z]/i.test(data1[0][property])) {
232950
232956
  list = data1.sort(function (a, b) {
232951
232957
  return a[property].localeCompare(b[property]);
232952
232958
  });
232953
232959
  } else {
232954
- list = data1.sort(function (a, b) {
232955
- return a[property] - b[property];
232956
- });
232960
+ if (isNaN(data1[0][property]) && !isNaN(Date.parse(data1[0][property]))) {
232961
+ list = data1.sort(function (a, b) {
232962
+ return new Date(a[property]).getTime() - new Date(b[property]).getTime();
232963
+ });
232964
+ } else {
232965
+ list = data1.sort(function (a, b) {
232966
+ return a[property] - b[property];
232967
+ });
232968
+ }
232957
232969
  }
232958
232970
  }
232959
232971
 
@@ -233112,7 +233124,7 @@ var component = normalizeComponent(
233112
233124
  var ch = $event.target.clientHeight;
233113
233125
  var sh = $event.target.scrollHeight;
233114
233126
 
233115
- if (scrollTop + ch >= sh) {
233127
+ if (scrollTop + ch >= sh && scrollTop != 0) {
233116
233128
  _this2.$emit("scrollBottom", ++_this2.pageIndex);
233117
233129
  }
233118
233130
  }, 200);
package/lib/jtui.umd.js CHANGED
@@ -231267,7 +231267,7 @@ var es_function_name = __webpack_require__("b0c0");
231267
231267
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
231268
231268
  var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
231269
231269
 
231270
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/index.vue?vue&type=template&id=d9e605f2&
231270
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/index.vue?vue&type=template&id=66056588&
231271
231271
  var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tableStyle-2",class:_vm.isWrap ? 'isWrap' : '',staticStyle:{"position":"absolute","top":"1px","left":"1px","right":"1px","bottom":"1px"}},[(_vm.isTool)?_c('div',{staticStyle:{"position":"relative"}},[_c('vxe-toolbar',{staticClass:"jt-toolbar",attrs:{"custom":{ icon: 'jtIcon iconpeizhi41 colStyle' }}})],1):_vm._e(),(_vm.tableType === 'default')?_c('vxe-table',{ref:_vm.id,staticClass:"jt-table-class-only",attrs:{"height":"auto","size":"mini","show-overflow":"","show-header-overflow":"","auto-resize":"","resizable":"","highlight-current-row":"","highlight-current-column":"","keep-source":"","id":_vm.id,"data":_vm.data.DataArray,"stripe":_vm.stripe,"border":_vm.border,"max-height":_vm.maxHeight,"show-footer":_vm.isFooter,"footer-method":_vm.footerMethod,"footer-span-method":_vm.footerColspanMethod,"footer-cell-class-name":_vm.footerCellClassName,"loading":_vm.loading,"row-style":_vm.rowStyle,"cell-style":_vm.cellStyle_m,"header-cell-class-name":_vm.headerClass,"span-method":_vm.spanMethod,"scroll-y":{ mode: 'wheel' },"sort-config":{ sortMethod: _vm.sortMethod },"radio-config":{ checkRowKey: null },"keyboard-config":{ isArrow: true },"checkbox-config":{ highlight: true },"export-config":{
231272
231272
  type: 'xlsx',
231273
231273
  types: ['xlsx', 'csv', 'html', 'xml', 'txt'],
@@ -231367,7 +231367,7 @@ return [(_vm.handlerConfig.btnGroup)?_c('el-dropdown',[_c('el-button',{attrs:{"s
231367
231367
  var staticRenderFns = []
231368
231368
 
231369
231369
 
231370
- // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=d9e605f2&
231370
+ // CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=66056588&
231371
231371
 
231372
231372
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
231373
231373
  var es_array_concat = __webpack_require__("99af");
@@ -232925,13 +232925,19 @@ var component = normalizeComponent(
232925
232925
  });
232926
232926
 
232927
232927
  return _item ? "<a href=\"javascript:\">".concat(cellValue, "</a>") : cellValue;
232928
+ } else if (data.htmlType == 'tag') {
232929
+ var _item2 = data.html.find(function (item) {
232930
+ return item.value == cellValue;
232931
+ });
232932
+
232933
+ return _item2 ? "<span style=\"\n display:inline-block;\n background-color: #fdf6ec;\n height: 26px;\n padding: 0 10px;\n line-height: 26px;\n font-size: 12px;\n color: #e6a23c;\n border: 1px solid #d9ecff;\n border-radius: 4px;\n box-sizing: border-box;\n white-space: nowrap;\n \">".concat(_item2.label, "</span>") : cellValue;
232928
232934
  }
232929
232935
  } else if (data && "enum" in data) {
232930
- var _item2 = data.enum.find(function (item) {
232936
+ var _item3 = data.enum.find(function (item) {
232931
232937
  return item.value == cellValue;
232932
232938
  });
232933
232939
 
232934
- return _item2 ? _item2.label : cellValue;
232940
+ return _item3 ? _item3.label : cellValue;
232935
232941
  } else {
232936
232942
  return cellValue;
232937
232943
  }
@@ -232955,14 +232961,20 @@ var component = normalizeComponent(
232955
232961
  var list = [];
232956
232962
 
232957
232963
  if (order === "asc" || order === "desc") {
232958
- if (/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property])) {
232964
+ if (/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property]) || /[a-zA-Z]/i.test(data1[0][property])) {
232959
232965
  list = data1.sort(function (a, b) {
232960
232966
  return a[property].localeCompare(b[property]);
232961
232967
  });
232962
232968
  } else {
232963
- list = data1.sort(function (a, b) {
232964
- return a[property] - b[property];
232965
- });
232969
+ if (isNaN(data1[0][property]) && !isNaN(Date.parse(data1[0][property]))) {
232970
+ list = data1.sort(function (a, b) {
232971
+ return new Date(a[property]).getTime() - new Date(b[property]).getTime();
232972
+ });
232973
+ } else {
232974
+ list = data1.sort(function (a, b) {
232975
+ return a[property] - b[property];
232976
+ });
232977
+ }
232966
232978
  }
232967
232979
  }
232968
232980
 
@@ -233121,7 +233133,7 @@ var component = normalizeComponent(
233121
233133
  var ch = $event.target.clientHeight;
233122
233134
  var sh = $event.target.scrollHeight;
233123
233135
 
233124
- if (scrollTop + ch >= sh) {
233136
+ if (scrollTop + ch >= sh && scrollTop != 0) {
233125
233137
  _this2.$emit("scrollBottom", ++_this2.pageIndex);
233126
233138
  }
233127
233139
  }, 200);