tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/pages/sample/ibizorder-area-chart-view/ibizorder-area-chart-view-base.vue

@@ -16,10 +16,10 @@
     :viewparams="viewparams" 
     :context="context" 
     :showBusyIndicator="true"
-    v-show="true"
+    v-show="isExpandSearchForm"
     loaddraftAction="FilterGetDraft"
     loadAction="FilterGet"
-@valuechange="quickFormValueChange"
+
     name="searchform"  
     ref='searchform' 
     @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-bar-chart-view/ibizorder-bar-chart-view-base.vue

@@ -16,10 +16,10 @@
     :viewparams="viewparams" 
     :context="context" 
     :showBusyIndicator="true"
-    v-show="true"
+    v-show="isExpandSearchForm"
     loaddraftAction="FilterGetDraft"
     loadAction="FilterGet"
-@valuechange="quickFormValueChange"
+
     name="searchform"  
     ref='searchform' 
     @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-grid-view/ibizorder-grid-view-base.vue

@@ -118,10 +118,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-line-chart-view/ibizorder-line-chart-view-base.vue

@@ -16,10 +16,10 @@
     :viewparams="viewparams" 
     :context="context" 
     :showBusyIndicator="true"
-    v-show="true"
+    v-show="isExpandSearchForm"
     loaddraftAction="FilterGetDraft"
     loadAction="FilterGet"
-@valuechange="quickFormValueChange"
+
     name="searchform"  
     ref='searchform' 
     @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-odsp-d-wfgrid-view/ibizorder-odsp-d-wfgrid-view-base.vue

@@ -98,10 +98,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-odsp-d10-wfgrid-view/ibizorder-odsp-d10-wfgrid-view-base.vue

@@ -113,10 +113,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-odsp-d20-wfgrid-view/ibizorder-odsp-d20-wfgrid-view-base.vue

@@ -98,10 +98,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-odsp-d30-wfgrid-view/ibizorder-odsp-d30-wfgrid-view-base.vue

@@ -98,10 +98,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-odsp-d40-wfgrid-view/ibizorder-odsp-d40-wfgrid-view-base.vue

@@ -98,10 +98,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-odsp-w-wfgrid-view/ibizorder-odsp-w-wfgrid-view-base.vue

@@ -75,10 +75,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-odsp-w10-wfgrid-view/ibizorder-odsp-w10-wfgrid-view-base.vue

@@ -82,10 +82,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-pickup-grid-view/ibizorder-pickup-grid-view-base.vue

@@ -10,10 +10,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-pie-chart-view/ibizorder-pie-chart-view-base.vue

@@ -16,10 +16,10 @@
     :viewparams="viewparams" 
     :context="context" 
     :showBusyIndicator="true"
-    v-show="true"
+    v-show="isExpandSearchForm"
     loaddraftAction="FilterGetDraft"
     loadAction="FilterGet"
-@valuechange="quickFormValueChange"
+
     name="searchform"  
     ref='searchform' 
     @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-radar-chart-view/ibizorder-radar-chart-view-base.vue

@@ -16,10 +16,10 @@
     :viewparams="viewparams" 
     :context="context" 
     :showBusyIndicator="true"
-    v-show="true"
+    v-show="isExpandSearchForm"
     loaddraftAction="FilterGetDraft"
     loadAction="FilterGet"
-@valuechange="quickFormValueChange"
+
     name="searchform"  
     ref='searchform' 
     @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-sf5-grid-view/ibizorder-sf5-grid-view-base.vue

@@ -82,10 +82,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-sf6-grid-view/ibizorder-sf6-grid-view-base.vue

@@ -75,10 +75,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-sgrid-view/ibizorder-sgrid-view-base.vue

@@ -118,10 +118,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/pages/sample/ibizorder-sgrid-view2/ibizorder-sgrid-view2-base.vue

@@ -118,10 +118,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @closeview="closeView($event)">

app_Web/src/pages/sample/ibizorder-zdytpgrid-view/ibizorder-zdytpgrid-view-base.vue

@@ -68,10 +68,10 @@
                 :viewparams="viewparams" 
                 :context="context" 
                 :showBusyIndicator="true"
-                v-show="true"
+                v-show="isExpandSearchForm"
                 loaddraftAction="FilterGetDraft"
                 loadAction="FilterGet"
-            @valuechange="quickFormValueChange"
+            
                 name="searchform"  
                 ref='searchform' 
                 @save="searchform_save($event)"  

app_Web/src/widgets/ibizorder/default-searchform/default-searchform-base.vue

@@ -20,6 +20,12 @@
           </i-col>
       </row>
     </i-col>
+    <i-col span="4" class="search-button">
+      <row v-show="Object.keys(data).length>0">
+        <i-button class='search_reset'  size="default" type="primary"  @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
+        <i-button class='search_reset'  size="default"  @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>
+      </row>
+    </i-col>
   </row>
 </i-form>
 
@@ -351,7 +357,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         this.resetFormData({ name: name, newVal: newVal, oldVal: oldVal });
         this.formLogic({ name: name, newVal: newVal, oldVal: oldVal });
         this.dataChang.next(JSON.stringify(this.data));
-        this.$emit('valuechange',this.data);
     }
 
     /**

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
 
-EXPOSE 51000
+EXPOSE 8081
 
 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar

demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml

@@ -3,24 +3,9 @@ services:
   demo-provider-demoapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
     ports:
-      - "51000:51000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: