cloud-web-corejs-haier 1.0.3 → 1.0.5

package/src/components/xform/form-render/container-item/tab-item.vue

@@ -1,27 +1,57 @@
 <template>
-  <container-item-wrapper :widget="widget" :class="widget.options.isFullscreen ? 'full-height':''">
-    <div :key="widget.id" class="tab-container" v-show="!widget.options.hidden">
-      <el-tabs v-model="activeTabName" :type="widget.displayType" :ref="widget.id"
-               :class="[customClass,widget.options.tabClass]"
-               :style="{'height': widget.options.isFullscreen ? '' : widget.options.height}">
-        <el-tab-pane v-for="(tab, index) in visibleTabs" :key="index" :label="getI18nLabel(tab.options.label)"
-                     :disabled="tab.options.disabled" :name="tab.options.name">
+  <container-item-wrapper
+    :widget="widget"
+    :class="widget.options.isFullscreen ? 'full-height' : ''"
+  >
+    <div :key="widget.id" class="tab-container mHeight" v-show="!widget.options.hidden">
+      <el-tabs
+        v-model="activeTabName"
+        :type="widget.displayType"
+        :ref="widget.id"
+        :class="[customClass, widget.options.tabClass]"
+        :style="{
+          height: widget.options.isFullscreen ? '' : widget.options.height || '300px',
+        }"
+      >
+        <el-tab-pane
+          v-for="(tab, index) in visibleTabs"
+          :key="index"
+          :label="getI18nLabel(tab.options.label)"
+          :disabled="tab.options.disabled"
+          :name="tab.options.name"
+        >
           <template v-for="(subWidget, swIdx) in tab.widgetList">
             <template v-if="'container' === subWidget.category">
-              <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="tab.widgetList"
-                         :index-of-parent-list="swIdx" :parent-widget="widget" :tableParam="tableParam" :formItemProp="formItemProp">
+              <component
+                :is="subWidget.type + '-item'"
+                :widget="subWidget"
+                :key="swIdx"
+                :parent-list="tab.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+                :tableParam="tableParam"
+                :formItemProp="formItemProp"
+              >
                 <!-- 递归传递插槽！！！ -->
                 <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope"/>
+                  <slot :name="slot" v-bind="scope" />
                 </template>
               </component>
             </template>
             <template v-else>
-              <component :is="subWidget.type + '-widget'" :field="subWidget" :key="swIdx" :parent-list="tab.widgetList"
-                         :index-of-parent-list="swIdx" :parent-widget="widget" :tableParam="tableParam" :formItemProp="formItemProp">
+              <component
+                :is="subWidget.type + '-widget'"
+                :field="subWidget"
+                :key="swIdx"
+                :parent-list="tab.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+                :tableParam="tableParam"
+                :formItemProp="formItemProp"
+              >
                 <!-- 递归传递插槽！！！ -->
                 <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope"/>
+                  <slot :name="slot" v-bind="scope" />
                 </template>
               </component>
             </template>
@@ -33,36 +63,36 @@
 </template>
 
 <script>
-import emitter from '../../../../components/xform/utils/emitter';
-import i18n from '../../../../components/xform/utils/i18n';
-import refMixin from '../../../../components/xform/form-render/refMixin';
-import ContainerItemWrapper from './container-item-wrapper';
-import containerItemMixin from './containerItemMixin';
-import FieldComponents from '../../../../components/xform/form-designer/form-widget/field-widget/index';
+import emitter from "../../../../components/xform/utils/emitter";
+import i18n from "../../../../components/xform/utils/i18n";
+import refMixin from "../../../../components/xform/form-render/refMixin";
+import ContainerItemWrapper from "./container-item-wrapper";
+import containerItemMixin from "./containerItemMixin";
+import FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
 
 export default {
-  name: 'tab-item',
-  componentName: 'ContainerItem',
+  name: "tab-item",
+  componentName: "ContainerItem",
   mixins: [emitter, i18n, refMixin, containerItemMixin],
   components: {
     ContainerItemWrapper,
-    ...FieldComponents
+    ...FieldComponents,
   },
   props: {
-    widget: Object
+    widget: Object,
   },
-  inject: ['refList', 'sfRefList', 'globalModel'],
+  inject: ["refList", "sfRefList", "globalModel"],
   data() {
     return {
-      activeTabName: ''
+      activeTabName: "",
     };
   },
   computed: {
     visibleTabs() {
-      return this.widget.tabs.filter(tp => {
+      return this.widget.tabs.filter((tp) => {
         return !tp.options.hidden;
       });
-    }
+    },
   },
   created() {
     this.initRefList();
@@ -75,8 +105,8 @@ export default {
   },
   methods: {
     initActiveTab() {
-      if (this.widget.type === 'tab' && this.widget.tabs.length > 0) {
-        let activePanes = this.widget.tabs.filter(tp => {
+      if (this.widget.type === "tab" && this.widget.tabs.length > 0) {
+        let activePanes = this.widget.tabs.filter((tp) => {
           return tp.options.active === true;
         });
         if (activePanes.length > 0) {
@@ -85,9 +115,11 @@ export default {
           this.activeTabName = this.widget.tabs[0].options.name;
         }
       }
-    }
-  }
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  ::v-deep .mHeight .el-tabs .el-tabs__content{min-height:312px}
+</style>

package/src/components/xform/form-render/container-item/tree-item.vue

@@ -2,16 +2,21 @@
   <container-item-wrapper :widget="widget">
     <div>
       <div class="tree-form">
-        <el-input
-          v-if="widget.options.filter"
-          :key="0"
-          :size="widget.options.size"
-          :placeholder="i18nt('designer.setting.enterForQuery')"
-          v-model="filterText"
-          class="txt"
-        >
-          <el-button slot="append" icon="el-icon-search"></el-button>
-        </el-input>
+        <template v-if="widget.options.filter">
+          <el-input
+            v-if="!widget.options.treeFilterType"
+            :key="0"
+            :size="widget.options.size"
+            :placeholder="i18nt('designer.setting.enterForQuery')"
+            v-model="filterText"
+            @change="handleFilterTextChange"
+            class="txt"
+          >
+            <el-button slot="append" icon="el-icon-search" @click="handleClickButton"></el-button>
+          </el-input>
+          <el-date-picker v-else-if="widget.options.treeFilterType==1" v-model="filterText" type="date" value-format="yyyy-MM-dd" @change="handleFilterTextChange" :placeholder="$t1('请输入日期')"></el-date-picker>
+        </template>
+
       </div>
       <div class="tree-btns"
            v-show="widget.options.selectClearAllNode && widget.options.showCheckBox || widget.options.expandRetractAllNode">
@@ -60,6 +65,7 @@
         @check="handleTreeNodeCheck"
         @check-change="handleCheckChange"
         :load="loadNode"
+        v-if="showTree"
       >
           <span class="custom-tree-node" slot-scope="{ node, data }">
             <span>{{ node.label }}</span>
@@ -128,6 +134,7 @@ export default {
         disabled: this.isDisabled,
         isLeaf: 'leaf'
       },
+      showTree:true
     };
   },
   computed: {
@@ -137,7 +144,9 @@ export default {
   },
   watch: {
     filterText(o) {
-      this.$refs.tree.filter(o);
+      if(!this.widget.options.disLocalFilter){
+          this.$refs.tree.filter(o);
+      }
     },
   },
   props: {
@@ -340,6 +349,18 @@ export default {
         loopDo();
       }
     },
+    handleClickButton(){
+      this.handleCustomEvent(this.widget.options.onFilterIconClick,["keyword"],[this.filterText])
+    },
+    handleFilterTextChange(val){
+      this.handleCustomEvent(this.widget.options.onFilterTextChange,["keyword"],[val])
+    },
+    reflushTree(){
+      this.showTree = false;
+      this.$nextTick(()=>{
+        this.showTree = true;
+      })
+    }
     /*loadDataFromDS(o = {}, e = "") {
       let n = e || this.widget.options.dsName,
         l = this.widget.options.dataSetName,

package/src/components/xform/form-render/index.vue

@@ -24,12 +24,18 @@
       <template v-if="showFormContent">
         <template v-for="(widget, index) in widgetList">
           <template v-if="'container' === widget.category">
-            <component :is="getContainerWidgetName(widget)" :widget="widget" :field="widget" :key="widget.id"
-                       :parent-list="widgetList"
-                       :index-of-parent-list="index" :parent-widget="null">
+            <component
+              :is="getContainerWidgetName(widget)"
+              :widget="widget"
+              :field="widget"
+              :key="widget.id"
+              :parent-list="widgetList"
+              :index-of-parent-list="index"
+              :parent-widget="null"
+            >
               <!-- 递归传递插槽！！！ -->
               <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                <slot :name="slot" v-bind="scope"/>
+                <slot :name="slot" v-bind="scope" />
               </template>
             </component>
           </template>
@@ -46,40 +52,80 @@
             >
               <!-- 递归传递插槽！！！ -->
               <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                <slot :name="slot" v-bind="scope"/>
+                <slot :name="slot" v-bind="scope" />
               </template>
             </component>
           </template>
         </template>
       </template>
     </el-form>
-    <searchFormDialog v-if="showSearchDialog" :visiable.sync="showSearchDialog"
-                      :option="searchDialogOption"></searchFormDialog>
-    <formDialog v-if="showFormDialog" :visiable.sync="showFormDialog" :option="formDialogOption"></formDialog>
-    <importDialog v-if="showImportDialog" :visiable.sync="showImportDialog" :param="importDialogOption"
-                  :parentTarget="_self"></importDialog>
-    <formDrawer v-if="showFormDrawer" :visiable.sync="showFormDrawer" :option="formDrawerOption"></formDrawer>
-    <fileReferenceDialog v-if="showFileReferenceDialog" :visiable.sync="showFileReferenceDialog" :option="fileReferenceDialogOption"></fileReferenceDialog>
+    <searchFormDialog
+      v-if="showSearchDialog"
+      :visiable.sync="showSearchDialog"
+      ref="searchFormDialog"
+      :option="searchDialogOption"
+    ></searchFormDialog>
+    <formDialog
+      v-if="showFormDialog"
+      :visiable.sync="showFormDialog"
+      ref="formDialog"
+      :option="formDialogOption"
+    ></formDialog>
+    <importDialog
+      v-if="showImportDialog"
+      :visiable.sync="showImportDialog"
+      :param="importDialogOption"
+      :parentTarget="_self"
+    ></importDialog>
+    <formDrawer
+      v-if="showFormDrawer"
+      :visiable.sync="showFormDrawer"
+      :option="formDrawerOption"
+    ></formDrawer>
+    <fileReferenceDialog
+      v-if="showFileReferenceDialog"
+      :visiable.sync="showFileReferenceDialog"
+      :option="fileReferenceDialogOption"
+    ></fileReferenceDialog>
+    <formulaDialog
+      v-if="formulaDialogVisible"
+      :visiable.sync="formulaDialogVisible"
+      :option="formulaDialogOption"
+    ></formulaDialog>
+    <baseFormulaDialog
+      v-if="baseFormulaDialogVisible"
+      :visiable.sync="baseFormulaDialogVisible"
+      :option="baseFormulaDialogOption"
+    ></baseFormulaDialog>
   </div>
 </template>
 
 <script>
 //import ElForm from 'element-ui/packages/form/src/form.vue'  /* 用于源码调试Element UI */
-import './container-item/index';
-import FieldComponents from '../../../components/xform/form-designer/form-widget/field-widget/index';
-import indexMixin from '../../../components/xform/form-render/indexMixin';
-
+import "./container-item/index";
+import FieldComponents from "../../../components/xform/form-designer/form-widget/field-widget/index";
+import indexMixin from "../../../components/xform/form-render/indexMixin";
 
 export default {
-  name: 'VFormRender',
+  name: "VFormRender",
   components: {
     ...FieldComponents,
-    searchFormDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/searchFormDialog.vue"),
-    formDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/formDialog.vue"),
-    importDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/importDialog.vue"),
-    formDrawer: () => import("../../../components/xform/form-designer/form-widget/dialog/formDrawer.vue"),
-    fileReferenceDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue")
-
+    searchFormDialog: () =>
+      import(
+        "../../../components/xform/form-designer/form-widget/dialog/searchFormDialog.vue"
+      ),
+    formDialog: () =>
+      import("../../../components/xform/form-designer/form-widget/dialog/formDialog.vue"),
+    importDialog: () =>
+      import(
+        "../../../components/xform/form-designer/form-widget/dialog/importDialog.vue"
+      ),
+    formDrawer: () =>
+      import("../../../components/xform/form-designer/form-widget/dialog/formDrawer.vue"),
+    fileReferenceDialog: () =>
+      import(
+        "../../../components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue"
+      ),
   },
   mixins: [indexMixin],
 };