eoss-mobiles 0.2.68 → 0.2.70

package/packages/flow/src/components/Opinion.vue

@@ -14,6 +14,7 @@
               v-show="isImageOpinion === 1"
               @save="handleSave"
               :file-path="esignPath"
+              :esign-line-width="esignLineWidth"
             />
             <div
               v-show="isImageOpinion === 0"
@@ -136,6 +137,10 @@ export default {
       type: Boolean,
       default: false
     },
+    esignLineWidth:{
+      type:[String,Number],
+      default:5
+    },
     userId: {
       type: String,
       default: ''
@@ -196,7 +201,6 @@ export default {
     } else {
       this.getOpinionList();
     }
-    console.log(this.placeholder,'sad')
   },
   methods: {
     

package/packages/flow/src/components/Reject.vue

@@ -9,6 +9,9 @@
         :code="processObj.attachedCode"
         :ownId="$route.query.pendingId"
         :esign="esign"
+        :esignLineWidth="
+            $attrs['esign-line-width'] || $attrs['esignLineWidth']
+          "
         @onInputOpintion="onInputOpintion"
         :placeholder="opinionHandleExplainText"
         :isOpinionRequired="isBanInputOpinion"

package/packages/flow/src/components/StartFlow.vue

@@ -13,6 +13,9 @@
         :code="processObj.attachedCode"
         :ownId="businessId"
         :esign="esign"
+        :esignLineWidth="
+            $attrs['esign-line-width'] || $attrs['esignLineWidth']
+          "
         :isFile="false"
         :baseUrl="baseUrl"
         @onInputOpintion="onInputOpintion"

package/packages/flow/src/components/taskUnionExamine.vue

@@ -8,6 +8,9 @@
       <Opinion
         @onInputOpintion="onInputOpintion"
         :esign="esign"
+        :esignLineWidth="
+            $attrs['esign-line-width'] || $attrs['esignLineWidth']
+          "
         :baseUrl="baseUrl"
       ></Opinion>
       <div class="input-box">

package/packages/flow/src/flowMix.js

@@ -69,7 +69,6 @@ export default {
     },
     getProcessObj() {
       let that = this;
-      console.log('获取流程');
       return new Promise(function(resolve, reiect) {
         request({
           url: that.baseUrl

package/packages/flow-btn/src/main.vue

@@ -286,7 +286,6 @@ export default {
             console.log('失败');
           })
           .finally(() => {
-            console.log(333);
           });
       } else {
         this.$emit('click', {

package/packages/form/src/main.vue

@@ -6,29 +6,29 @@
     @failed="handleFailed"
     @submit="handleSubmit"
   >
-  <div class="em-form-content">
- <div v-for="(item, index) in newContent" :key="index">
-      <em-input
-        v-if="
-          item.type === 'text' ||
-            item.type === 'textarea' ||
-            item.type == 'number' ||
-            item.type == 'digit' ||
-            item.type == 'password' ||
-            item.type == 'tel'
-        "
-        class="em-table-input"
-        v-bind="{ ...$attrs, ...item }"
-        v-on="{...item.events}"
-        :label-position="item.labelPosition || labelPosition"
-        :disabled="item.disabled || disabled"
-        :readonly="item.readonly || readonly"
-        ref="input"
-        v-model="model[item.name]"
-        :label="item.label.text || item.label"
-        @input="handleChange(item.name, model[item.name])"
-      />
-      <!-- <em-input
+    <div class="em-form-content">
+      <div v-for="(item, index) in newContent" :key="index">
+        <em-input
+          v-if="
+            item.type === 'text' ||
+              item.type === 'textarea' ||
+              item.type == 'number' ||
+              item.type == 'digit' ||
+              item.type == 'password' ||
+              item.type == 'tel'
+          "
+          class="em-table-input"
+          v-bind="{ ...$attrs, ...item }"
+          v-on="{ ...item.events }"
+          :label-position="item.labelPosition || labelPosition"
+          :disabled="item.disabled || disabled"
+          :readonly="item.readonly || readonly"
+          ref="input"
+          v-model="model[item.name]"
+          :label="item.label.text || item.label"
+          @input="handleChange(item.name, model[item.name])"
+        />
+        <!-- <em-input
         v-if="
           (item.type === 'text' ||
             item.type === 'textarea' ||
@@ -48,149 +48,149 @@
         :label="item.label.text || item.label"
         @input="handleChange(item.name, model[item.name])"
       /> -->
-      <em-picker
-        v-if="item.type === 'select'"
-        v-bind="{ ...$attrs, ...item }"
-        v-on="{...item.events}"
-        ref="select"
-        :label-position="item.labelPosition || labelPosition"
-        :disabled="item.disabled || disabled"
-        :readonly="item.readonly || readonly"
-        v-model="model[item.name]"
-        :columns="item.data || []"
-        @confirm="
-          value => {
-            handleChange(item.name, value);
-          }
-        "
-      />
-      <em-date
-        v-else-if="
-          item.date ||
-            item.type == 'date' ||
-            item.type == 'year' ||
-            item.type == 'year-month' ||
-            item.type == 'month-day' ||
-            item.type == 'time' ||
-            item.type == 'datetimeSecond' ||
-            item.type == 'datetime' ||
-            item.type == 'datehour'
-        "
-        ref="date"
-        v-bind="{ ...$attrs, ...item }"
-        v-on="{...item.events}"
-        v-model="model[item.name]"
-        :label-position="item.labelPosition || labelPosition"
-        :disabled="item.disabled || disabled"
-        :readonly="item.readonly || readonly"
-        :joinStr="item.joinStr || ''"
-        @confirm="
-          (value, timePeriod) => {
-            handleChange(item.name, value, timePeriod);
-          }
-        "
-      />
-      <em-input
-        v-else-if="item.type === 'radio'"
-        ref="radio"
-        v-bind="{ ...$attrs, ...item }"
-        :label-position="item.labelPosition || labelPosition"
-      >
-        <template slot="input">
-          <em-radio-group
-            v-bind="{ ...$attrs, ...item }"
-        v-on="{...item.events}"
-            v-model="model[item.name]"
-            :disabled="item.disabled || disabled || item.readonly || readonly"
-            :data="item.data"
-            @change="
-              value => {
-                handleChange(item.name, value);
-              }
-            "
-          />
-        </template>
-      </em-input>
-      <em-input
-        v-else-if="item.type === 'checkbox'"
-        ref="checkbox"
-        v-bind="{ ...$attrs, ...item }"
-        :label-position="item.labelPosition || labelPosition"
-      >
-        <template slot="input">
-          <em-checkbox-group
-            v-bind="{ ...$attrs, ...item }"
-        v-on="{...item.events}"
-            v-model="model[item.name]"
-            :disabled="item.disabled || disabled || item.readonly || readonly"
-            @change="
-              value => {
-                handleChange(item.name, value);
-              }
-            "
-          />
-        </template>
-      </em-input>
-      <em-input
-        v-else-if="item.type === 'switch'"
-        ref="switch"
-        v-bind="{ ...$attrs, ...item }"
-        :label-position="item.labelPosition || labelPosition"
-      >
-        <template slot="input">
-          <em-switch
-            v-bind="{ ...$attrs, ...item }"
-            v-model="model[item.name]"
-        v-on="{...item.events}"
-            :disabled="item.disabled || disabled || item.readonly || readonly"
-            @change="
-              value => {
-                handleChange(item.name, value);
-              }
-            "
-          />
-        </template>
-      </em-input>
-      <em-selector
-        v-else-if="item.type == 'selector'"
-        ref="selector"
-        v-bind="{ ...$attrs, ...item }"
-        v-model="model[item.name]"
-        v-on="{...item.events}"
-        :label="item.label"
-        :label-position="item.labelPosition || labelPosition"
-        :disabled="item.disabled || disabled || item.readonly || readonly"
-        @change="
-          value => {
-            handleChange(item.name, value);
-          }
-        "
-      />
-      <em-table
-        v-else-if="item.type == 'table'"
-        class="em-form-table"
-        ref="emFormTable"
-        v-bind="{ ...$attrs, ...item }"
-        :data="model[item.name]"
-        :thead="item.tHead"
-        :style="`margin:${item.margin || 10}px 0px`"
-        isForm
-        :form="
-          !item.disabled &&
-            !disabled &&
-            !item.readonly &&
-            !readonly &&
-            item.form
-        "
-        v-on="{...item.events}"
-        @btn-click="handleBtnClick"
-      />
-      <!-- @btn-click="handleBtnClick($event,item)"
+        <em-picker
+          v-if="item.type === 'select'"
+          v-bind="{ ...$attrs, ...item }"
+          v-on="{ ...item.events }"
+          ref="select"
+          :label-position="item.labelPosition || labelPosition"
+          :disabled="item.disabled || disabled"
+          :readonly="item.readonly || readonly"
+          v-model="model[item.name]"
+          :columns="item.data || []"
+          @confirm="
+            value => {
+              handleChange(item.name, value);
+            }
+          "
+        />
+        <em-date
+          v-else-if="
+            item.date ||
+              item.type == 'date' ||
+              item.type == 'year' ||
+              item.type == 'year-month' ||
+              item.type == 'month-day' ||
+              item.type == 'time' ||
+              item.type == 'datetimeSecond' ||
+              item.type == 'datetime' ||
+              item.type == 'datehour'
+          "
+          ref="date"
+          v-bind="{ ...$attrs, ...item }"
+          v-on="{ ...item.events }"
+          v-model="model[item.name]"
+          :label-position="item.labelPosition || labelPosition"
+          :disabled="item.disabled || disabled"
+          :readonly="item.readonly || readonly"
+          :joinStr="item.joinStr || ''"
+          @confirm="
+            (value, timePeriod) => {
+              handleChange(item.name, value, timePeriod);
+            }
+          "
+        />
+        <em-input
+          v-else-if="item.type === 'radio'"
+          ref="radio"
+          v-bind="{ ...$attrs, ...item }"
+          :label-position="item.labelPosition || labelPosition"
+        >
+          <template slot="input">
+            <em-radio-group
+              v-bind="{ ...$attrs, ...item }"
+              v-on="{ ...item.events }"
+              v-model="model[item.name]"
+              :disabled="item.disabled || disabled || item.readonly || readonly"
+              :data="item.data"
+              @change="
+                value => {
+                  handleChange(item.name, value);
+                }
+              "
+            />
+          </template>
+        </em-input>
+        <em-input
+          v-else-if="item.type === 'checkbox'"
+          ref="checkbox"
+          v-bind="{ ...$attrs, ...item }"
+          :label-position="item.labelPosition || labelPosition"
+        >
+          <template slot="input">
+            <em-checkbox-group
+              v-bind="{ ...$attrs, ...item }"
+              v-on="{ ...item.events }"
+              v-model="model[item.name]"
+              :disabled="item.disabled || disabled || item.readonly || readonly"
+              @change="
+                value => {
+                  handleChange(item.name, value);
+                }
+              "
+            />
+          </template>
+        </em-input>
+        <em-input
+          v-else-if="item.type === 'switch'"
+          ref="switch"
+          v-bind="{ ...$attrs, ...item }"
+          :label-position="item.labelPosition || labelPosition"
+        >
+          <template slot="input">
+            <em-switch
+              v-bind="{ ...$attrs, ...item }"
+              v-model="model[item.name]"
+              v-on="{ ...item.events }"
+              :disabled="item.disabled || disabled || item.readonly || readonly"
+              @change="
+                value => {
+                  handleChange(item.name, value);
+                }
+              "
+            />
+          </template>
+        </em-input>
+        <em-selector
+          v-else-if="item.type == 'selector'"
+          ref="selector"
+          v-bind="{ ...$attrs, ...item }"
+          v-model="model[item.name]"
+          v-on="{ ...item.events }"
+          :label="item.label"
+          :label-position="item.labelPosition || labelPosition"
+          :disabled="item.disabled || disabled || item.readonly || readonly"
+          @change="
+            value => {
+              handleChange(item.name, value);
+            }
+          "
+        />
+        <em-table
+          v-else-if="item.type == 'table'"
+          class="em-form-table"
+          ref="emFormTable"
+          v-bind="{ ...$attrs, ...item }"
+          :data="model[item.name]"
+          :thead="item.tHead"
+          :style="`margin:${item.margin || 10}px 0px`"
+          isForm
+          :form="
+            !item.disabled &&
+              !disabled &&
+              !item.readonly &&
+              !readonly &&
+              item.form
+          "
+          v-on="{ ...item.events }"
+          @btn-click="handleBtnClick"
+        />
+        <!-- @btn-click="handleBtnClick($event,item)"
         @selection-change="handleSelectionChange($event,item)"
         @edit="handleEdit($event,item)" -->
+      </div>
     </div>
-  </div>
-   
+
     <div
       :style="`margin: 16px;text-align:${position}`"
       v-if="showBtn && !disabled && !readonly"
@@ -280,9 +280,6 @@ export default {
     // this.setBtnType()
   },
   methods: {
-    clickRightIcon(e){
-      console.log('点急急急急急急')
-    },
     handleFailed(values) {
       this.$refs.emFormTable.map(item => {
         item.validate();

package/packages/picker/src/main.vue

@@ -75,6 +75,13 @@
         @cancel="showPicker = false"
         @confirm="onConfirm($event, true)"
       >
+        <template slot="columns-top" v-if="isSearch">
+          <em-search
+            v-model="keyWord"
+            @search="handleSearch"
+            placeholder="请输入搜索关键词"
+          />
+        </template>
         <template v-for="(index, name) in $slots" :slot="name">
           <slot :name="name" />
         </template>
@@ -92,7 +99,14 @@
         @cancel="onConfirm"
         @confirm="onConfirm($event, true)"
       >
-        <template slot="columns-top">
+        <template slot="columns-top" v-if="isSearch">
+          <em-search
+            v-model="keyWord"
+            @search="handleSearch"
+            placeholder="请输入搜索关键词"
+          />
+        </template>
+        <template slot="columns-bottom">
           <div class="em-picker__columns">
             <em-list
               v-model="listLoading"
@@ -133,6 +147,7 @@ export default {
     return {
       showPicker: false,
       newLoading: false,
+      keyWord: '',
       newLabelKey: '',
       newValueKey: '',
       listLoading: false,
@@ -150,6 +165,10 @@ export default {
       type: [String, Array, Object],
       default: ''
     },
+    isSearch: {
+      type: Boolean,
+      default: false
+    },
     hideLabel: {
       type: Boolean,
       default: false
@@ -197,6 +216,10 @@ export default {
       type: String,
       default: 'value'
     },
+    searchKey: {
+      type: String,
+      default: 'keyWord'
+    },
     labelKey: {
       type: String,
       default: 'name'
@@ -270,6 +293,10 @@ export default {
     }
   },
   watch: {
+    events: {
+      type: Object,
+      default: () => {}
+    },
     labelKey: {
       handler(val) {
         this.newLabelKey = val;
@@ -330,6 +357,21 @@ export default {
     }
   },
   methods: {
+    handleSearch() {
+      this.$emit('search', this.keyWord);
+
+      if (this.columns.length > 0) {
+        this.newColumns = this.columns.filter(
+          x => x[this.labelKey].indexOf(this.keyWord) != -1
+        );
+        if (!this.keyWord) {
+          this.newColumns = this.columns;
+        }
+      }
+
+      if ((this.columns && this.columns.length == 0) || !this.columns)
+        this.getSysCode();
+    },
     handleClick(val) {
       if (this.linkTag) {
         this.$emit('tagClick', val);
@@ -361,6 +403,7 @@ export default {
       this.pickerValue.splice(val, 1);
       this.checkList = this.checkList.filter(x => x != res.value);
       this.$emit('input', this.pickerValue);
+
       this.$emit('tagDelete', this.pickerValue);
     },
     toggle(index) {
@@ -464,7 +507,7 @@ export default {
       return value;
     },
     getSysCode() {
-      const { url, method, sysAppCode, param } = this;
+      let { url, method, sysAppCode, param, keyWord } = this;
       let params = {
         url: this.baseUrl
           ? this.baseUrl + (url || findSysCode)
@@ -476,6 +519,9 @@ export default {
           ...param
         }
       };
+      if (this.isSearch) {
+        params.params[this.searchKey] = keyWord;
+      }
       this.newLoading = true;
       request(params)
         .then(res => {