From 5f6d363bb85231650493d946a9a45b105f90a039 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 16 Aug 2023 13:52:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=AF=BC=E6=B5=81?= =?UTF-8?q?=E5=8C=BA=E7=BA=B9=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/navinfo/omqs/db/ImportOMDBHelper.kt | 5 +++++ collect-library/src/main/assets/editormarker.xml | 6 +++++- .../src/main/assets/omdb/tex_fill_area_3012.png | Bin 0 -> 2285 bytes .../src/main/assets/omdb/tex_fill_area_3012.svg | 1 + .../assets/omdb/tex_fill_area_with_text_3012.png | Bin 0 -> 3864 bytes 5 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3012.png create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3012.svg create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_with_text_3012.png diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index f652b11e..501736a2 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -191,6 +191,11 @@ class ImportOMDBHelper @AssistedInject constructor( else -> renderEntity.properties.put(key, value.toString()) } } + + // 如果properties中不包含name，那么自动将要素名称添加进properties中 + if (!renderEntity.properties.containsKey("name")) { + renderEntity.properties["name"] = renderEntity.name; + } //遍历判断只显示与任务Link相关的任务数据 if(currentConfig.checkLinkId){ diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index bd0c3979..a83f8377 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -54,6 +54,9 @@ + + @@ -2272,7 +2275,8 @@ - + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3012.png b/collect-library/src/main/assets/omdb/tex_fill_area_3012.png new file mode 100644 index 0000000000000000000000000000000000000000..405fc2b5a55255d705250e53c747c39cb12a9ca6 GIT binary patch literal 2285 zcmeH|YgiLk9>ymLjO=vA#&t$RqBhBTnIx_zKnMs{a#N{1FbNl+}xF=3R<O@+ie`iidhtyZY+NDqQ5{CCYqJ^Whqyl<&NWx_R_x2J@=u+5ybvM?c*%}Hz@ z>yCNkD{lPL!;|XCNeezHdVmd|%P{9nuCw!c=|g?JH_yVU9mu`5g#Z?>b&WpOb2tg@ zS%73U%+()bxmx8O*$}n8f8jA%VknR8|MVyf(=?kr#B6N3^YT4R?^f##xdhPx7ge-% z#+%e(Au>BfY&Kqf@?_0;ozlN>9s*mSgX-nJ2s=JRHD2i{InI@r(o;dOO4I5!+CzDe znzKrjBa{wNsxOw<-=!;(c)SoOSo;~1Il7{SE8Q#L(P$3EwlSh~gX*m4$Ed#@AtEy* z9Y}Hi(E*T33vRi=0HJLEzDqD%-2eU`CCy(SDnb)+7gfs6wM%oTNkf#=(j$BMeGO;N z?p>F1dKOR2jCx|2yUme zNK8z=tw&ba*Y;60)qdd(Vo7yRMcHq*u8)}YS1jrBt0$1hE!p)cwa7NQ#`jjAAQ#hIL5NbUR2q9zq~Q}u0r0mqv~07>~3%Gj5SjfUd+HTmC56dVyehAhH>3Q#nNY%0m%rg0GlI-w?f za=XL?ih^$m8M7b=WrGcx7H>*Os0mVVw4yAbOo!-f^~IH36&Hmli;Z>@?hM@M358Ia z%C*&qlHIwjMvov21+>T5mMnu6{s3~i)vSow7@^g$B6V1vHeqwOtm{#fcd+aEuO&4*g+V2Va(rEZxkXj|IK>BQK5=~{deWb4y3U0-$`w$E0jx`RB7msi_|rpnE<$-M1hXe8|ms`rr>MQ(bVmCC7v3QM6^FNfIE@l5N84DVt@3Q_@O3 z-f)`9apJR#$n;r1j-)UJDfgb?o$>&L%ic+R^zzVLSrF1dzu0*#(Qs}cUD9w4Ltek% zaE*0g+uAO(I|M1vU$v&SASV44Yf2>&Wh*M;^}JZQYis}`XAD;?-Z`mU|7$gPShdS} zF1nKC$&!1~4?qXw2Mj0q01cC;#ci(I)(DUE1oCqgw7M$s2oFvp5LBXG^HT+YhTu-2 z$INR%=aY_-Y_6dmVM8oVy2xUdmcsLG&SEz=!hta$qq!4jvJ`$PEY>s7X{c+A=a{>r8Y0*xuXa7v2NJ zfnaai7xmrq>3QT)Cx0%To~P9-R8iYUWligjm;wi%_PsJRZ@6>QAmww^dH9D5hm(ia zZ;{VR#=5WXZ7p5oEWhIppGkf{=glsFthUsje~hTS<|^LkEfpm&%MI|w>iNxx+>4Q; zC(HZ5fKlol^sPJ&EcYuXJZH{~f2$;CY-^mnGw8Zlo{;trolFciiE{wiZ$XbZ8<6s0 zx&H60$}B}3dK|Qhn_YFSVYn;|siAX8hViNMt({{V4+S!)0Q literal 0 HcmV?d00001 diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3012.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3012.svg new file mode 100644 index 00000000..53e1f77d --- /dev/null +++ b/collect-library/src/main/assets/omdb/tex_fill_area_3012.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_with_text_3012.png b/collect-library/src/main/assets/omdb/tex_fill_area_with_text_3012.png new file mode 100644 index 0000000000000000000000000000000000000000..d07d62121161aac85b6affe24a258e4440a17f82 GIT binary patch literal 3864 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 W(=)b_pm*>S0}RO~x@Fq5=zjya!Eko~ literal 0 HcmV?d00001