centaline-data-driven 1.1.3 → 1.1.7

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -1,45 +1,45 @@
-<template>
-  <div class="field-top">
-    <div style="width:100%;display:flex">
-      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
-       ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
-        <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
-          <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
-            {{model.label}}
-          </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
-            <div>
-              <div>
-                <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
-              </div>
-              <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
-            </div>
-            <input slot="reference" v-bind="model.attrs" readonly="readonly" v-model="model.text" :placeholder="soPlaceholder"
-                   ref="ct-input" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
-                   @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" @change="changeHandler($event)"
-                   :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'" />
-          </el-popover>
-          <span v-if="!model.lock" class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
-            <span v-if="showClear === false" class="el-input__suffix-inner">
-              <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{'is-reverse':showDrop}"></i>
-            </span>
-            <span v-if="showClear === true" class="el-input__suffix-inner ct-close">
-              <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
-            </span>
-          </span>
-        </div>
-      </div>
-      <transition name="el-fade-in">
-        <span v-show="!valid" class="errorMessage">
-          {{validMessage}}
-        </span>
-      </transition>
-      <div v-if="!model.lock && model.popupSearchListType === 1">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
-      </div>
-    </div>
-  </div>
+<template>
+  <div class="field-top">
+    <div style="width:100%;display:flex">
+      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+       ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+        <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
+          <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
+            {{model.label}}
+          </div>
+          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+            <div>
+              <div>
+                <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
+              </div>
+              <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+            </div>
+            <input slot="reference" v-bind="model.attrs" readonly="readonly" v-model="model.text" :placeholder="soPlaceholder"
+                   ref="ct-input" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
+                   @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" @change="changeHandler($event)"
+                   :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'" />
+          </el-popover>
+          <span v-if="!model.lock" class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
+            <span v-if="showClear === false" class="el-input__suffix-inner">
+              <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{'is-reverse':showDrop}"></i>
+            </span>
+            <span v-if="showClear === true" class="el-input__suffix-inner ct-close">
+              <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
+            </span>
+          </span>
+        </div>
+      </div>
+      <transition name="el-fade-in">
+        <span v-show="!valid" class="errorMessage">
+          {{validMessage}}
+        </span>
+      </transition>
+      <div v-if="!model.lock && model.popupSearchListType === 1">
+        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -171,26 +171,26 @@
         }
         if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
-        }
-        //else if (this.model.popupSearchListType === 1) {
+        }
+        //else if (this.model.popupSearchListType === 1) {
         //  //todo 以后可加上即可选单搜索 又可高级搜索
         //}
-        else {
+        else {
           if (this.model.paramName) {
             this.$set(this, 'showDrop', !this.showDrop);
             if (this.showDrop) {
               this.getOptions();
             }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
+            this.focusHandle();
+          }
+          else if ((this.model.popupSearchListType === 0)) {
+            this.$message.warning("请配置参数paramName1");
           }
         }
       },
       popupSearchListHandle: function () {
-        var self = this;
-        self.$emit('popupSearchList', true, self.model, self.model.moreActionRouter, (option) => {
+        var self = this;
+        self.$emit('popupSearchList', true, self.model, self.model.moreActionRouter, (option) => {
           if (option) {
             self.model.value = option[self.model.optionAttrs.value];
             self.model.text = option[self.model.optionAttrs.label];
@@ -200,7 +200,7 @@
             });
 
             self.soChange();
-          }
+          }
         });
       },
       getOptionText: function (value) {
@@ -220,10 +220,10 @@
           return "success";
         }
       },
-      selectOption(value) {
+      selectOption(value) {
         if (this.model.value === value) {
-          //this.model.value = '';
-          this.$set(this, 'showDrop', false);
+          //this.model.value = '';
+          this.$set(this, 'showDrop', false);
           return;
         }
         else {

package/src/centaline/dynamicSw/src/dynamicSw.vue

@@ -1,23 +1,23 @@
-<template>
-  <div class="field-top">
-    <div v-if="model !== null" class="ct-Sw">
-      <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
-        <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
-          {{model.label}}
-        </div>
-        <div class="ct-radios">
-          <el-switch v-model="model.value" class="ct-switch" :disabled="model.lock"
-                     @change="changeSwitchHandler">
-          </el-switch>
-        </div>
-      </div>
-      <transition name="el-fade-in">
-        <span v-show="!valid" class="errorMessage">
-          {{validMessage}}
-        </span>
-      </transition>
-    </div>
-  </div>
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ct-Sw">
+      <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
+          {{model.label}}
+        </div>
+        <div class="ct-radios">
+          <el-switch v-model="model.value" class="ct-switch" :disabled="model.lock"
+                     @change="changeSwitchHandler">
+          </el-switch>
+        </div>
+      </div>
+      <transition name="el-fade-in">
+        <span v-show="!valid" class="errorMessage">
+          {{validMessage}}
+        </span>
+      </transition>
+    </div>
+  </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement';

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -1,23 +1,23 @@
-<template>
-  <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
-      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
-        <span>{{model.label}}</span>
-      </div>
-      <el-input :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event)" @change="changeHandler($event)"
-                class="ct-flex-div-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
-                :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on">
-        <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
-      </el-input>
-      <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-      <transition name="el-fade-in" class="ct-flex-div-span">
-        <span v-show="!valid" class="errorMessage ">
-          {{validMessage}}
-        </span>
-      </transition>
-      <ct-quick-input v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @input="model.value=$event"></ct-quick-input>
-    </div>
-  </div>
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
+      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
+        <span>{{model.label}}</span>
+      </div>
+      <el-input :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event)" @change="changeHandler($event)"
+                class="ct-flex-div-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
+                :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on">
+        <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
+      </el-input>
+      <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
+      <transition name="el-fade-in" class="ct-flex-div-span">
+        <span v-show="!valid" class="errorMessage ">
+          {{validMessage}}
+        </span>
+      </transition>
+      <ct-quick-input v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @input="model.value=$event"></ct-quick-input>
+    </div>
+  </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement';

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="field-top">
-    <div class="ct-tags" style="width:100%;display:flex">
-      <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
-    ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
-        <div style="flex:1;position: relative;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
-          <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
-            {{model.label}}
-          </div>
-          <div>
-            <div ref="cttags" class="el-select__tags" :style="{'max-width':tagsWidth + 'px'}" @click="clickHandle">
-              <span>
-                <span class="ct-tags-value-label">{{model.valueLabel}}</span>
-                <span class="el-tag el-tag--info" :class="[model.attrs.size?'el-tag--'+model.attrs.size:'']" v-for="item in model.value">
-                  <span class="el-select__tags-text">{{getOptionText(item)}}</span>
-                  <i v-if="!model.lock" class="el-tag__close el-icon-close" @click="deleteOption(item,$event)"></i>
-                </span>
-              </span>
-            </div>
-            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType === 2 || model.lock) ? 'manual' : 'click'">
-              <div>
-                <div>
-                  <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
-                </div>
-                <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
-              </div>
-              <input slot="reference" v-bind="model.attrs" :placeholder="tagsPlaceholder"
-                     ref="ct-input" class="" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
-                     :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"
-                     @focus="focusHandle" @blur="blurHandle" @click="clickHandle"
-                     :disabled="model.lock" />
-            </el-popover>
-            <span v-if="!model.lock" class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
-              <span v-if="showClear === false" class="el-input__suffix-inner">
-                <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{'is-reverse':showDrop}"></i>
-              </span>
-              <span v-if="showClear === true" class="el-input__suffix-inner ct-close">
-                <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
-              </span>
-            </span>
-          </div>
-        </div>
-        <span v-show="!valid" class="errorMessage">
-          {{validMessage}}
-        </span>
-      </div>
-
-      <div v-if="model.popupSearchListType === 1 && !model.lock">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
-      </div>
-    </div>
-  </div>
+<template>
+  <div class="field-top">
+    <div class="ct-tags" style="width:100%;display:flex">
+      <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
+    ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+        <div style="flex:1;position: relative;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
+          <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
+            {{model.label}}
+          </div>
+          <div>
+            <div ref="cttags" class="el-select__tags" :style="{'max-width':tagsWidth + 'px'}" @click="clickHandle">
+              <span>
+                <span class="ct-tags-value-label">{{model.valueLabel}}</span>
+                <span class="el-tag el-tag--info" :class="[model.attrs.size?'el-tag--'+model.attrs.size:'']" v-for="item in model.value">
+                  <span class="el-select__tags-text">{{getOptionText(item)}}</span>
+                  <i v-if="!model.lock" class="el-tag__close el-icon-close" @click="deleteOption(item,$event)"></i>
+                </span>
+              </span>
+            </div>
+            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType === 2 || model.lock) ? 'manual' : 'click'">
+              <div>
+                <div>
+                  <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
+                </div>
+                <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+              </div>
+              <input slot="reference" v-bind="model.attrs" :placeholder="tagsPlaceholder"
+                     ref="ct-input" class="" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
+                     :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"
+                     @focus="focusHandle" @blur="blurHandle" @click="clickHandle"
+                     :disabled="model.lock" />
+            </el-popover>
+            <span v-if="!model.lock" class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
+              <span v-if="showClear === false" class="el-input__suffix-inner">
+                <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{'is-reverse':showDrop}"></i>
+              </span>
+              <span v-if="showClear === true" class="el-input__suffix-inner ct-close">
+                <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
+              </span>
+            </span>
+          </div>
+        </div>
+        <span v-show="!valid" class="errorMessage">
+          {{validMessage}}
+        </span>
+      </div>
+
+      <div v-if="model.popupSearchListType === 1 && !model.lock">
+        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -190,24 +190,24 @@
         if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
+        else {
           if (this.model.paramName) {
             this.$set(this, 'showDrop', !this.showDrop);
             if (this.showDrop) {
               this.getOptions();
             }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
+            this.focusHandle();
+          }
+          else if ((this.model.popupSearchListType === 0)) {
+            this.$message.warning("请配置参数paramName1");
           }
         }
       },
       popupSearchListHandle: function () {
-        var self = this;
-
-        self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
-          self.selectOptionArr(optionArr);
+        var self = this;
+
+        self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
+          self.selectOptionArr(optionArr);
         });
       },
       resetInputHeight() {

package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue

@@ -1,36 +1,36 @@
-<template>
-  <div class="field-top">
-    <div style="width:100%" v-if="model !== null" class="ct-input-number" :class="[model.attrs.size?'ct-checkbox-'+model.attrs.size:''
-       ]">
-      <div class="ct-input-number-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
-        <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
-          {{model.label}}
-        </div>
-        <div class="ct-datepicker" style="width:100%" v-if="model !== null" :class="[model.showLabel?'showLabel':'']">
-          <!--<el-time-picker :is-range="model.isRange" style="width:100%"
-                        v-model="model.timeValue"
-                        range-separator="-"
-                        start-placeholder="开始时间"
-                        end-placeholder="结束时间"
-                        :placeholder="model.attrs.placeholder1"
-                        :disabled="model.lock"
-                        @change="onChangeHandler($event)">
-        </el-time-picker>-->
-          <el-time-picker v-model="model.timeValue1"
-                          placeholder="任意时间点">
-          </el-time-picker>
-          <!--<span v-if="!model.lock" class="cover-list-item-span">
-          <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
-        </span>-->
-        </div>
-      </div>
-      <transition name="el-fade-in">
-        <span v-show="!valid" class="errorMessage">
-          {{validMessage}}
-        </span>
-      </transition>
-    </div>
-  </div>
+<template>
+  <div class="field-top">
+    <div style="width:100%" v-if="model !== null" class="ct-input-number" :class="[model.attrs.size?'ct-checkbox-'+model.attrs.size:''
+       ]">
+      <div class="ct-input-number-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
+          {{model.label}}
+        </div>
+        <div class="ct-datepicker" style="width:100%" v-if="model !== null" :class="[model.showLabel?'showLabel':'']">
+          <!--<el-time-picker :is-range="model.isRange" style="width:100%"
+                        v-model="model.timeValue"
+                        range-separator="-"
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        :placeholder="model.attrs.placeholder1"
+                        :disabled="model.lock"
+                        @change="onChangeHandler($event)">
+        </el-time-picker>-->
+          <el-time-picker v-model="model.timeValue1"
+                          placeholder="任意时间点">
+          </el-time-picker>
+          <!--<span v-if="!model.lock" class="cover-list-item-span">
+          <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
+        </span>-->
+        </div>
+      </div>
+      <transition name="el-fade-in">
+        <span v-show="!valid" class="errorMessage">
+          {{validMessage}}
+        </span>
+      </transition>
+    </div>
+  </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement';

package/src/centaline/loader/src/ctl/Base.js

@@ -1,4 +1,4 @@
-const Base = function (source) {
+const Base = function (source) {
   let rtn = {
     collapseName: -1,
     index: 0,
@@ -56,9 +56,9 @@ const Base = function (source) {
     set labelValue(v) {
       source.code1 = v;
     },
-    defaultValue: source.defaultCode1,
-    defaultValue1: source.defaultCode2,
-    defaultValue2: source.defaultCode3,
+    defaultValue: source.defaultCode1 || '',
+    defaultValue1: source.defaultCode2 || '',
+    defaultValue2: source.defaultCode3 || '',
     get type() {
       return source.controlType;
     },
@@ -81,7 +81,7 @@ const Base = function (source) {
       source.api = v;
     },
     get paramName() {
-      return source.paramName1;
+      return source.paramName1;
     },
     set paramName(v) {
       source.paramName1 = v;
@@ -94,7 +94,7 @@ const Base = function (source) {
     },
     set change(v) {
       source.onChanged = v;
-    },
+    },
     //必填
     get required() {
       return source.required;
@@ -103,13 +103,12 @@ const Base = function (source) {
     set required(v) {
       source.required = v;
     },
-    get labelClass() {
-      let arr = [];
-      if (this.required) {
-        arr.push('requiredLabel');
-      }
+    get labelClass() {
+      if (source.required) {
+        return 'requiredLabel'
+      }
 
-      return arr;
+      return '';
     },
     get mrf() {//当mrf对应的Field的code1等于mrv时，当前组件必填
       return source.requiredRelationField;
@@ -138,17 +137,17 @@ const Base = function (source) {
     get lock() {
       return source.locked;
       //return true;
-    },
-    get listBind() {
-      let bind = {};
-      bind = {
-        style: {
-          //width: 200 + 'px',
-          'width': source.width + 'px',
-          display: 'inline-table'
-        }
-      }
-      return bind;
+    },
+    get listBind() {
+      let bind = {};
+      bind = {
+        style: {
+          //width: 200 + 'px',
+          'width': source.width + 'px',
+          display: 'inline-table'
+        }
+      }
+      return bind;
     },
     reset() {
       this.value = this.defaultValue;
@@ -210,8 +209,8 @@ const Base = function (source) {
     set min(v) {
       source.minValue1 = v;
     }
-  };
-
+  };
+
   return rtn;
 };
 export default Base;

package/src/centaline/loader/src/ctl/Button.js

@@ -3,6 +3,7 @@ import Base from './Base';
 const Button = function (source) {
   var rtn = {
     disabled: false,
+    loading: false,
     get api() {
       return source.api;
     },

package/src/centaline/loader/src/ctl/File.js

@@ -231,15 +231,13 @@ const box = function (source, fileSourceList, router, optionApi) {
           Vue.set(file, "progressFlag", false);
           Vue.set(file, "loadProgress", 100);
 
-          if (this.fileList.length === 0) {//无数据会监听不到
-            rtn.fileList = fileList;
-          }
+          rtn.fileList = fileList;//无数据会监听不到
         }
         else {
           Vue.prototype.$message.error(res.rtnMsg);
         }
       },
-      deleteFile(file, forceDelete) {
+      deleteFile(file, forceDelete) {
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {

package/src/centaline/loader/src/ctl/Form.js

@@ -60,7 +60,8 @@ const Form = function (source, callBack, apiParam, failCallBack) {
 
             rtn._fields.push(item);
           }
-        }
+        }
+        rtn.allRequiredHandle();//必填关联组件
         return rtn._fields;
       },
       get col() {
@@ -513,9 +514,14 @@ const Form = function (source, callBack, apiParam, failCallBack) {
             field.self.validExcute();
           }
         }
+      },
+      allRequiredHandle() {
+        rtn.fields.forEach(v => {
+          rtn.requiredHandle(v, null, false);
+        });
       },
       //处理必填关联组件
-      requiredHandle(item, update) {
+      requiredHandle(item, update, doMrf) {
         if (item.id) {
           let field = null;
 
@@ -543,8 +549,10 @@ const Form = function (source, callBack, apiParam, failCallBack) {
               }
             }
           }
-
-          rtn.validMrf(item);
+
+          if (doMrf !== false) {
+            rtn.validMrf(item);
+          }
         }
       },
       //绑定联动参数组件

package/src/centaline/loader/src/ctl/Mo.js

@@ -56,12 +56,12 @@ const Mo = function (source, moreActionRouter) {
           source.code1 = JSON.stringify(v);
         }
       }
-    },
-    get valueLabel() {
-      if (source.isList && this.value.length > 0 && rtn.attrs.placeholder) {
-        return rtn.attrs.placeholder + ":";
-      }
-      return '';
+    },
+    get valueLabel() {
+      if (source.isList && this.value.length > 0 && rtn.attrs.placeholder) {
+        return rtn.attrs.placeholder + ":";
+      }
+      return '';
     },
     get optionColCount() {
       return parseInt(source.optCount) || 5;