Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7 into dev

APP/public/assets/json/data-dictionary.json.ftl

@@ -15,6 +15,17 @@ TARGET=PSSYSAPP
                 "id": "${codeitem.getValue()?j_string}",
                 "label": "${codeitem.getText()?j_string}",
                 "text": "${codeitem.getText()?j_string}",
+                <#if codeitem.getPSSysImage()??>
+                <#assign codeitem = codeitem.getPSSysImage()/>
+                <#if sysimage.getImagePath() ==  "">
+                "iconclass":"${sysimage.getCssClass()}",
+                <#else>
+                "iconpath":"${sysimage.getImagePath()}",
+                </#if>
+                </#if>
+                <#if codeitem.getData()??>
+                "data":"${codeitem.getData()}",
+                </#if>
                 <#if codeitem.getColor?? && codeitem.getColor()??>
                 "color": "${codeitem.getColor()?j_string}",
                 </#if>

APP/src/mock/codelist/codelist.ts.ftl

@@ -24,6 +24,17 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: '${codeitem.getValue()?j_string}',
                 label: '${codeitem.getText()?j_string}',
                 text: '${codeitem.getText()?j_string}',
+                <#if codeitem.getPSSysImage()??>
+                <#assign codeitem = codeitem.getPSSysImage()/>
+                <#if sysimage.getImagePath() ==  "">
+                "iconclass":"${sysimage.getCssClass()}",
+                <#else>
+                "iconpath":"${sysimage.getImagePath()}",
+                </#if>
+                </#if>
+                <#if codeitem.getData()??>
+                "data":"${codeitem.getData()}",
+                </#if>
                 <#if codeitem.getColor?? && codeitem.getColor()??>
                 "color": "${codeitem.getColor()?j_string}",
                 </#if>