zhouweidong 发布系统代码 [ibz-lite，应用]

app_web/public/assets/json/data-dictionary.json

@@ -83,8 +83,8 @@
         "items": [
              {
                 "id": "0",
-                "label": "未导入",
-                "text": "未导入",
+                "label": "未激活",
+                "text": "未激活",
                 "class":"",
                 "data":"",
                 "codename":"Item_0",
@@ -94,8 +94,8 @@
             }
             , {
                 "id": "1",
-                "label": "已导入",
-                "text": "已导入",
+                "label": "已激活",
+                "text": "已激活",
                 "class":"",
                 "data":"",
                 "codename":"Item_1",

app_web/src/locale/lanres/codelist/codelist_BO_CN_base.ts

@@ -17,8 +17,8 @@ function getLocaleResourceBase(){
           "empty": commonLogic.appcommonhandle("",null),
       },
       DynamicModelStatus: {
-          "0": commonLogic.appcommonhandle("未导入",null),
-          "1": commonLogic.appcommonhandle("已导入",null),
+          "0": commonLogic.appcommonhandle("未激活",null),
+          "1": commonLogic.appcommonhandle("已激活",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
       AppType: {

app_web/src/locale/lanres/codelist/codelist_en_US_base.ts

@@ -17,8 +17,8 @@ function getLocaleResourceBase(){
           "empty": commonLogic.appcommonhandle("",null),
       },
       DynamicModelStatus: {
-          "0": commonLogic.appcommonhandle("未导入",null),
-          "1": commonLogic.appcommonhandle("已导入",null),
+          "0": commonLogic.appcommonhandle("未激活",null),
+          "1": commonLogic.appcommonhandle("已激活",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
       AppType: {

app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts

@@ -17,8 +17,8 @@ function getLocaleResourceBase(){
           "empty": commonLogic.appcommonhandle("",null),
       },
       DynamicModelStatus: {
-          "0": commonLogic.appcommonhandle("未导入",null),
-          "1": commonLogic.appcommonhandle("已导入",null),
+          "0": commonLogic.appcommonhandle("未激活",null),
+          "1": commonLogic.appcommonhandle("已激活",null),
           "empty": commonLogic.appcommonhandle("",null),
       },
       AppType: {

app_web/src/mock/codelist/codelist.ts

@@ -91,8 +91,8 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
         items: [
             {
                 id: "0",
-                label: "未导入",
-                text: "未导入",
+                label: "未激活",
+                text: "未激活",
                 "class":"",
                 "data":"",
                 "codename":"Item_0",
@@ -102,8 +102,8 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
             {
                 id: "1",
-                label: "已导入",
-                text: "已导入",
+                label: "已激活",
+                text: "已激活",
                 "class":"",
                 "data":"",
                 "codename":"Item_1",

app_web/src/widgets/dynamic-model-config/main-form/main-form-base.vue

@@ -621,9 +621,9 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        configname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        configname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
-        modelfile: new FormItemModel({ caption: '文件', detailType: 'FORMITEM', name: 'modelfile', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        modelfile: new FormItemModel({ caption: '文件', detailType: 'FORMITEM', name: 'modelfile', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
         configid: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'configid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[BLADE_VISUAL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual-55-1">
+    <changeSet author="root" id="tab-blade_visual-55-1">
         <createTable tableName="blade_visual">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2">
+    <changeSet author="root" id="tab-blade_visual_category-23-2">
         <createTable tableName="blade_visual_category">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
@@ -52,7 +52,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
+    <changeSet author="root" id="tab-blade_visual_config-18-3">
         <createTable tableName="blade_visual_config">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
@@ -68,7 +68,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
+    <changeSet author="root" id="tab-blade_visual_map-18-4">
         <createTable tableName="blade_visual_map">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
@@ -86,7 +86,7 @@
 
 
     <!--输出实体[DST_COMPONENT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_component-59-5">
+    <changeSet author="root" id="tab-dst_component-59-5">
         <createTable tableName="IBZCOMPONENT">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
@@ -112,7 +112,7 @@
 
 
     <!--输出实体[DST_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
+    <changeSet author="root" id="tab-dst_config-32-6">
         <createTable tableName="IBZCFG">
                 <column name="CFGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
@@ -134,7 +134,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-75-7">
+    <changeSet author="root" id="tab-dst_datasource-75-7">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -152,7 +152,7 @@
 
 
     <!--输出实体[DST_ROUTER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_router-37-8">
+    <changeSet author="root" id="tab-dst_router-37-8">
         <createTable tableName="IBZROUTER">
                 <column name="ROUTERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
@@ -178,7 +178,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-43-9">
+    <changeSet author="root" id="tab-dst_system-43-9">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -198,7 +198,7 @@
 
 
     <!--输出实体[DST_VIEW]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_view-46-10">
+    <changeSet author="root" id="tab-dst_view-46-10">
         <createTable tableName="IBZVIEW">
                 <column name="VIEWID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
@@ -222,7 +222,7 @@
 
 
     <!--输出实体[DYNAMIC_MODEL_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dynamic_model_config-44-11">
+    <changeSet author="root" id="tab-dynamic_model_config-50-11">
         <createTable tableName="IBZDYNAMICMODELCONFIG">
                 <column name="CONFIGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DYNAMIC_MODEL_CONFIG_CONFIG"/>
@@ -240,7 +240,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-33-12">
+    <changeSet author="root" id="tab-meta_dataset-33-12">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -262,7 +262,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-105-13">
+    <changeSet author="root" id="tab-meta_entity-105-13">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -294,7 +294,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-153-14">
+    <changeSet author="root" id="tab-meta_field-153-14">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -358,7 +358,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-44-15">
+    <changeSet author="root" id="tab-meta_model-44-15">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -384,7 +384,7 @@
 
 
     <!--输出实体[META_MODULE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_module-34-16">
+    <changeSet author="root" id="tab-meta_module-34-16">
         <createTable tableName="IBZMODULE">
                 <column name="MODULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
@@ -402,7 +402,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-106-17">
+    <changeSet author="root" id="tab-meta_relation-106-17">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -443,7 +443,7 @@
         <!--输出实体[DST_SYSTEM]外键关系 -->
         <!--输出实体[DST_VIEW]外键关系 -->
         <!--输出实体[DYNAMIC_MODEL_CONFIG]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-dynamic_model_config-44-18">
+    <changeSet author="root" id="fk-dynamic_model_config-50-18">
        <addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODELCONFIG" constraintName="DER1N_DYNAMIC_MODEL_CONFIG_DST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
     </changeSet>
         <!--输出实体[META_DATASET]外键关系 -->

ibzlite-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java

@@ -297,8 +297,8 @@ public class StaticDict {
      */
     @Getter
     public enum DynamicModelStatus {
-        ITEM_0("0","未导入"),
-        ITEM_1("1","已导入");
+        ITEM_0("0","未激活"),
+        ITEM_1("1","已激活");
 
         private String value;
         private String text;