ibiz4j 发布系统代码

app_web/src/components/app-dashboard-design/app-dashboard-design-service.ts

@@ -65,14 +65,21 @@ export default class AppDashboardDesignService {
     public loadPortletList(context: any, viewparams: any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             Http.getInstance().get('./assets/json/portlet-data.json').then((response: any) => {
-                if (response && response.status === 200 && response.data && Array.isArray(response.data)) {
-                    const datas: any[] = this.filterData(response.data, viewparams.appdeName);
+                if (response && response.status === 200 && response.data) {
+                    let result:Array<any> = [];
+                    if(typeof(response.data)=='string'){
+                        const index:number = response.data.lastIndexOf(",");
+                        result = JSON.parse((response.data).slice(0,index)+']');
+                    }else{
+                        result = response.data;
+                    }
+                    const datas: any[] = this.filterData(result, viewparams.appdeName);
                     const list = this.prepareList(datas);
                     const groups = this.prepareGroup(datas);
                     resolve({data: datas, result: list.reverse(), groups: groups});
                 }
             }).catch((response: any) => {
-                console.log(response.status);
+                console.log(response);
             });
         });
     }

app_web/src/widgets/wfmember/main-form/main-form-base.vue

@@ -8,7 +8,8 @@
     <row>
         <i-col v-show="detailsModel.personname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='personname' :itemRules="this.rules.personname" class='' :caption="$t('entities.wfmember.main_form.details.personname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.personname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-picker 
+    
+<app-picker 
   :formState="formState"
   :data="data"
   :context="context"

ibzwf-core/src/main/resources/liquibase/h2_table.xml

-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${dbinst.getUserName()}  [in template "CODETEMPL_zh_CN" at line 28, column 24]
-----
\ No newline at end of file
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+
+
+
+
+    <!--输出实体[WF_PSSYSTEM]数据结构 -->
+
+
+
+
+    <!--输出实体[WF_GROUP]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group-24-2">
+        <createTable tableName="IBZWFGROUP">
+                <column name="GROUPID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
+                </column>
+                <column name="GROUPNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="GROUPSCOPE" remarks="" type="VARCHAR(100)">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+
+
+
+
+
+
+
+
+    <!--输出实体[WF_DEFINITION]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-wf_definition-51-3">
+        <createTable tableName="IBZWFDEFINITION">
+                <column name="DEFINITIONKEY" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_WF_DEFINITION_DEFINITIONKEY"/>
+                </column>
+                <column name="DEFINITIONNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MODELVERSION" remarks="" type="INT">
+                </column>
+                <column name="MODELENABLE" remarks="" type="INT">
+                </column>
+                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="TASKDEFINITIONKEY" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MD5CHECK" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BPMNFILE" remarks="" type="VARCHAR(1000)">
+                </column>
+                <column name="DEPLOYKEY" remarks="" type="VARCHAR(100)">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+    <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-40-4">
+        <createTable tableName="IBZWFMEMBER">
+                <column name="MEMBERID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
+                </column>
+                <column name="MEMBERNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="GROUPID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="USERID" remarks="" type="VARCHAR(100)">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+
+        <!--输出实体[WF_PSSYSTEM]外键关系 -->
+        <!--输出实体[WF_GROUP]外键关系 -->
+        <!--输出实体[WF_DEFINITION]外键关系 -->
+        <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
+    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-40-5">
+       <addForeignKeyConstraint baseColumnNames="GROUPID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_GROUP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="GROUPID" referencedTableName="IBZWFGROUP" validate="true"/>
+    </changeSet>
+
+</databaseChangeLog>

ibzwf-util/src/main/java/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java

@@ -253,7 +253,7 @@ public class DEFieldDefaultValueAspect
                         et.set(fieldname,curUser.getMdeptname());
                     break;
                 case LOGICVALID:
-                    if(!StringUtils.isEmpty(logicValue)){
+                    if(StringUtils.isEmpty(logicValue)){
                         logicValue="1";
                     }
                     et.set(fieldname,logicValue);