eoss-ui 0.5.81-beta2 → 0.5.81-beta20

package/lib/wxlogin.js

@@ -3251,7 +3251,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doQrLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return logout; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return initLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return switchUserTo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return switchUserTo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return changeImg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getLoginCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "m", function() { return doCodeLogin; });
@@ -3266,12 +3266,15 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return doTwoFactorLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return initRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return getRetrialAuthCode; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return userOnline; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return getUserAppWithTag; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return recordUserApp; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Yb", function() { return updateUserInfo; });
 /* unused harmony export getUserImgUrl */
 /* unused harmony export getDoorIndex */
 /* unused harmony export refreshOnlineUsers */
@@ -3279,19 +3282,18 @@ var watermark = function watermark(option) {
 /* unused harmony export getApplicationIdArray */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return getComplexApplications; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getComplexApplicationsNew; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return getUserAppWithTag; });
 /* unused harmony export getUserCustomInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Wb", function() { return updateUserCustomInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return sysMsgPage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserCustomInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return sysMsgPage; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return ignoreSysMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return ignoreAllSysMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return getAdjunctProperties; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bc", function() { return uploads; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Zb", function() { return uploadOnlyOne; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return uploads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ac", function() { return uploadOnlyOne; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return getAdjunctFileInfos; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ac", function() { return uploadSort; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bc", function() { return uploadSort; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "r", function() { return downloadByAdjunctId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Yb", function() { return uploadDownloads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Zb", function() { return uploadDownloads; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jb", function() { return previewAdjunct; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "kb", function() { return previewAdjunct2; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lb", function() { return previewAdjunctOffice; });
@@ -3309,13 +3311,13 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return gethelpdoc; });
 /* unused harmony export getCurrentuser */
 /* unused harmony export mainDetail */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toStartFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return tempSave; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toStartFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return tempSave; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return commonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return addCommonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return editCommonOpion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return saveCommonOpinion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vb", function() { return updateCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return saveCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Wb", function() { return updateCommonOpinion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return deleteCommonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return getProcessDefList; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return getNodeInfo; });
@@ -3324,52 +3326,52 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return findSysCodes; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return getNotificationMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return getHandleInfoHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return taskHandleHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return taskHandleHtml; });
 /* unused harmony export getView */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return register; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return register; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gb", function() { return pendedhistoryList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return toTaskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return taskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toStartTaskRead; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return toStartTaskReadIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return taskReadHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return rejectAndEnd; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toSendMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return sendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return toTaskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return taskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return toStartTaskRead; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return toStartTaskReadIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return taskReadHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return rejectAndEnd; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toSendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return sendMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ec", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ub", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return toTaskTransferIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return taskTransfer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return toPresetInfoListIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return toTaskTransferIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return taskTransfer; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toPresetInfoListIndex; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return deletePresetInfo; });
 /* unused harmony export historyListJson */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return pendedhistoryListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return pressListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return deleteFlow; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return isCanStartSubFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return toTaskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return taskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return toTaskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return taskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return toTaskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return taskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return toTaskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return taskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return toTaskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return taskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return toTwoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ub", function() { return twoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return sendList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return sendInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return toTaskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return taskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return toTaskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return taskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return toTaskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return taskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return toTaskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return taskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return toTaskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return taskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return toTwoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vb", function() { return twoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return sendList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return sendInfo; });
 /* unused harmony export sendSave */
 /* unused harmony export sendUpdate */
 /* unused harmony export sendDelete */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return sendBatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return sendBatch; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return formContents; });
 // 登录
 var doCaLogin = '/sso2/signIn/auth/doCaLogin'; // ca登录认证
@@ -3397,6 +3399,9 @@ var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证
 var doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin'; // 二级身份验证-验证码验证
 
 // 框架
+var userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml'; // 在线人数列表
+var getUserAppWithTag = '/sysv3/sysUucApp/getUserAppWithTag'; // 获取应用
+var recordUserApp = '/sysv3/sysUucApp/recordUserApp'; // 记录应用点击率
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 var updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息
@@ -3407,7 +3412,6 @@ var getQuickMenuIds = '/main2/main/getQuickMenuIds'; // 获取已绑定的快捷
 var getApplicationIdArray = '/main2/main/getApplicationIdArray'; // 获取应用父id数组
 var getComplexApplications = '/main2/menu/getComplexApplications'; // 获取当前用户菜单; 含页签菜单格式的数据
 var getComplexApplicationsNew = '/main2/menu/getComplexApplicationsNew'; // 获取当前用户应用菜单; 含页签菜单格式的数据
-var getUserAppWithTag = '/sysv3/sysUucApp/getUserAppWithTag'; // 获取应用
 var getUserCustomInfo = '/main2/main/getUserCustomInfo'; // 获取主题样式
 var updateUserCustomInfo = '/main2/main/updateUserCustomInfo'; // 更新主题样式
 // 框架 - 系统消息

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.81-beta2",
+  "version": "0.5.81-beta20",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.4",
+    "eoss-element": "^0.3.15",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/button/src/main.vue

@@ -261,7 +261,7 @@ export default {
       }
     }
     let tag = 'el-button';
-    let clas = ['es-button'];
+    let clas = '';
     let props = {};
     let attrs = {};
     let listeners = {};
@@ -283,6 +283,7 @@ export default {
         size: this.size
       };
     } else {
+      clas = ['es-button'];
       props = { ...this.$attrs, type: this._type, size: this.size };
       listeners = { ...this.$listeners, click: this.handleClick };
       if (this.link && !this.open) {

package/packages/button-group/src/main.vue

@@ -5,7 +5,6 @@
         <template v-if="item && !item.hide">
           <es-upload
             v-if="item.upload || (item.code && item.ownId)"
-            class="el-button"
             v-bind="{
               ...exclAttribute({
                 data: item,
@@ -15,7 +14,7 @@
               method: 'post',
               btnSize: size,
               showFileList: false,
-              selectType: item.type ? item.type : ''
+              selectType: mode == 'plus' ? 'text' : item.type
             }"
             v-on="item.events"
           ></es-upload>
@@ -30,7 +29,7 @@
             "
             :key="index"
             :size="size"
-            :type="item.type"
+            :type="mode == 'plus' ? 'text' : item.type"
             v-on="item.events"
             @click="handleClick({ ...data, handle: item })"
           >
@@ -50,8 +49,9 @@
       @visible-change="handleChange"
       :trigger="trigger"
     >
-      <el-button :size="size">
-        <template v-if="moreText">
+      <el-button :size="size" :type="mode == 'plus' ? 'text' : ''">
+        <template v-if="mode == 'plus'">更多</template>
+        <template v-else-if="moreText">
           {{ moreText }}
           <i
             :class="{
@@ -68,6 +68,7 @@
           :key="index"
           :command="item"
           :class="{ 'es-dropdown-padding': item.upload || item.selector }"
+          v-show="!item.hide"
         >
           <es-upload
             v-if="item.upload || (item.code && item.ownId)"
@@ -128,6 +129,7 @@ export default {
     };
   },
   props: {
+    mode: String,
     value: String,
     data: Object,
     contents: { type: Array, default: [] },
@@ -139,7 +141,7 @@ export default {
     stop: Boolean,
     trigger: {
       type: String,
-      default: 'click'
+      default: 'hover'
     },
     useCaseCodeKey: String,
     moreText: String,

package/packages/clients/src/main.vue

@@ -48,7 +48,7 @@
           <div class="es-qr-code-box" v-else>
             <es-qr-code :content="item" auto></es-qr-code>
           </div>
-          <div class="es-clients-remark" v-if="key == 'ios'">
+          <div class="es-clients-remark" v-if="key == 'ios' && showTips">
             备注： 苹果手机安装后请在设置- -通用- -设备管理中进行激活操作
           </div>
         </li>
@@ -80,6 +80,7 @@ export default {
   name: 'EsClients',
   inheritAttrs: false,
   props: {
+    showTips: Boolean,
     downloads: Object,
     logo: String,
     pcImage: {

package/packages/data-table/src/column.vue

@@ -10,10 +10,49 @@
           :rules="isNotRule(scope) ? [] : rules"
           :index="scope.$index"
         >
+          <component
+            v-if="getType(scope.row.formConfigs, 'component')"
+            :is="tag"
+            v-bind="formOption"
+            v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
+            @blur="
+              (event) => {
+                handleBlur({
+                  item: config,
+                  event: event,
+                  data: scope.row,
+                  scope: scope
+                });
+              }
+            "
+            @focus="
+              (event) => {
+                handleFocus({
+                  item: config,
+                  event: event,
+                  data: scope.row,
+                  scope: scope
+                });
+              }
+            "
+            @change="
+              (value) => {
+                handleChange({
+                  item: config,
+                  name: field || prop,
+                  value: value,
+                  data: scope.row,
+                  scope: scope
+                });
+              }
+            "
+          ></component>
           <es-select
-            v-if="type === 'select'"
+            v-else-if="getType(scope.row.formConfigs, 'select')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @blur="
               (event) => {
                 handleBlur({
@@ -45,11 +84,13 @@
                 });
               }
             "
-          ></es-select>
+          >
+          </es-select>
           <es-cascader
-            v-else-if="type == 'cascader'"
+            v-else-if="getType(scope.row.formConfigs, 'cascader')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @blur="
               (event) => {
                 handleBlur({
@@ -84,10 +125,10 @@
           >
           </es-cascader>
           <es-select-ganged
-            v-else-if="type === 'ganged'"
+            v-else-if="getType(scope.row.formConfigs, 'ganged')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
-            :data="init(option, config)"
+            :data="init(getData(scope.row.formOptions), config)"
             @change="
               (value) => {
                 handleChange({
@@ -98,11 +139,13 @@
                 });
               }
             "
-          ></es-select-ganged>
+          >
+          </es-select-ganged>
           <es-radio-group
-            v-else-if="type === 'radio'"
+            v-else-if="getType(scope.row.formConfigs, 'radio')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @change="
               (value) => {
                 handleChange({
@@ -113,11 +156,13 @@
                 });
               }
             "
-          ></es-radio-group>
+          >
+          </es-radio-group>
           <es-checkbox-group
-            v-else-if="type === 'checkbox'"
+            v-else-if="getType(scope.row.formConfigs, 'checkbox')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @change="
               (value) => {
                 handleChange({
@@ -128,11 +173,13 @@
                 });
               }
             "
-          ></es-checkbox-group>
+          >
+          </es-checkbox-group>
           <es-switch
-            v-else-if="type === 'switch'"
+            v-else-if="getType(scope.row.formConfigs, 'switch')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @change="
               (value) => {
                 handleChange({
@@ -143,22 +190,25 @@
                 });
               }
             "
-          ></es-switch>
+          >
+          </es-switch>
           <es-date-picker
             v-else-if="
               config.date ||
-              type == 'date' ||
-              type == 'year' ||
-              type == 'month' ||
-              type == 'date' ||
-              type == 'dates' ||
-              type == 'week' ||
-              type == 'datetime' ||
-              type == 'datetimerange' ||
-              type == 'daterange' ||
-              type == 'monthrange' ||
-              type == 'quarter' ||
-              type == 'halfyear'
+              getType(scope.row.formConfigs, [
+                'date',
+                'year',
+                'month',
+                'date',
+                'dates',
+                'week',
+                'datetime',
+                'datetimerange',
+                'daterange',
+                'monthrange',
+                'quarter',
+                'halfyear'
+              ])
             "
             v-bind="formOption"
             v-model="scope.row[field || prop]"
@@ -194,9 +244,10 @@
                 });
               }
             "
-          ></es-date-picker>
+          >
+          </es-date-picker>
           <es-input-number
-            v-else-if="type == 'number'"
+            v-else-if="getType(scope.row.formConfigs, 'number')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
             @blur="
@@ -230,9 +281,10 @@
                 });
               }
             "
-          ></es-input-number>
+          >
+          </es-input-number>
           <es-selector
-            v-else-if="type == 'selector'"
+            v-else-if="getType(scope.row.formConfigs, 'selector')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
             v-on="
@@ -251,15 +303,16 @@
                 });
               }
             "
-          ></es-selector>
+          >
+          </es-selector>
           <template
             v-else-if="
-              type === 'text' || type === 'input' || type === 'textarea'
+              getType(scope.row.formConfigs, ['text', 'input', 'textarea'])
             "
           >
             <template v-if="config.lazy">
               <input
-                v-if="type === 'text' || type === 'input'"
+                v-if="getType(scope.row.formConfigs, ['text', 'input'])"
                 class="el-input__inner"
                 v-bind="formOption"
                 v-model.lazy="scope.row[field]"
@@ -370,7 +423,8 @@
                   });
                 }
               "
-            ></es-input>
+            >
+            </es-input>
           </template>
         </el-form-item>
       </template>
@@ -402,6 +456,7 @@
           })
         "
         stop
+        :mode="mode"
         :contents="contents || events"
         :data="scope"
         @handleClick="handleClick"
@@ -459,6 +514,8 @@ export default {
     }
   },
   props: {
+    tag: String,
+    mode: String,
     service: String,
     form: Boolean,
     readonly: Boolean,
@@ -582,8 +639,7 @@ export default {
           : this.valueKey,
         rules: this.rules,
         events: this.events,
-        ...this.$attrs,
-        data: this.option
+        ...this.$attrs
       };
       return config;
     },
@@ -725,6 +781,18 @@ export default {
       }
       return data;
     },
+    getType(config, types) {
+      let type =
+        config && config[this.field || this.prop]
+          ? config[this.field || this.prop]
+          : this.type;
+      return Array.isArray(types) ? types.includes(type) : type == types;
+    },
+    getData(res) {
+      return res && res[this.field || this.prop]
+        ? res[this.field || this.prop]
+        : this.option;
+    },
     exclAttribute({ data, attrs }) {
       return util.exclAttribute({ data, attrs });
     },
@@ -824,10 +892,14 @@ export default {
       this.$emit('formFocus', data);
       this.$emit('form-focus', data);
     },
-    handleChange(data) {
-      let { item } = data;
-      if (item && this.type == 'ganged') {
-        let { index, value } = data.value;
+    handleChange(datas) {
+      let { item, name, data } = datas;
+      if (
+        item &&
+        ((data.formConfigs && data.formConfigs[name] == 'ganged') ||
+          this.type == 'ganged')
+      ) {
+        let { index, value } = datas.value;
         if (
           (item.url || this.sysCode) &&
           ((item.ganged && index > item.ganged - 1) || value.hasSub)
@@ -888,9 +960,9 @@ export default {
           }
         }
       }
-      this.events && this.events.change && this.events.change(data);
-      this.$emit('formChange', data);
-      this.$emit('form-change', data);
+      this.events && this.events.change && this.events.change(datas);
+      this.$emit('formChange', datas);
+      this.$emit('form-change', datas);
     },
     handleClick(data) {
       this.$emit('handleClick', data);