eoss-ui 0.5.84 → 0.5.86

package/lib/data-table.js

@@ -2015,20 +2015,20 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
-        for (var _i7 = 0; _i7 < keys.length; _i7++) {
-          var k = keys[_i7];
-          if (typeof target === 'string' && arry[_i7][k] === target) {
-            return _i7;
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
+        for (var n = 0; n < keys.length; n++) {
+          var k = keys[n];
+          if (typeof target === 'string' && arry[i][k] === target) {
+            return i;
           }
-          if (target[k] === arry[_i7][k]) {
-            return _i7;
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
+            return i;
           }
         }
       } else {
@@ -2771,22 +2771,22 @@ var setStorage = function setStorage(_ref14) {
         localStorage.setItem(key[i], value);
       }
     } else {
-      for (var _i8 in key) {
-        var val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
-        localStorage.setItem(_i8, val);
+      for (var _i7 in key) {
+        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
+        localStorage.setItem(_i7, val);
       }
     }
   } else {
     if (typeof key === 'string') {
       sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
-      for (var _i9 in key) {
-        sessionStorage.setItem(key[_i9], value);
+      for (var _i8 in key) {
+        sessionStorage.setItem(key[_i8], value);
       }
     } else {
-      for (var _i10 in key) {
-        var _val = _typeof(key[_i10]) === 'object' ? JSON.stringify(key[_i10]) : key[_i10];
-        sessionStorage.setItem(_i10, _val);
+      for (var _i9 in key) {
+        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
+        sessionStorage.setItem(_i9, _val);
       }
     }
   }
@@ -3435,7 +3435,7 @@ var sysMsgPage = '/main2/notify/sysMsgPage'; // 获取系统消息
 var ignoreSysMsg = '/main2/notify/ignoreSysMsg'; // 忽略系统消息
 var ignoreAllSysMsg = '/main2/notify/ignoreAllSysMsg'; // 忽略全部系统消息
 // 框架 - 搜索
-var searchType = '/oceanSearch/v2/search/catalog'; // 搜索分类类型
+var searchType = '/oceansearch/v2/search/catalog'; // 搜索分类类型
 
 // 附件相关
 var getAdjunctProperties = '/main2/mecpfileManagement/getAdjunctProperties'; // 获取附件扩展类型大小
@@ -3611,7 +3611,8 @@ var sendDelete = '/notify2/notifySendRecord/deleteById';
 var sendBatch = '/notify2/sendRecord/reSendNotifyMessageBatch';
 
 // 表单结构
-var formContents = '/config/admin/online/onlineForm/render';
+
+var formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
 
 /***/ }),
 /* 2 */
@@ -3954,8 +3955,8 @@ module.exports = require("vue");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=3a307e68&
-var mainvue_type_template_id_3a307e68_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=d6bac15c&
+var mainvue_type_template_id_d6bac15c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4036,7 +4037,7 @@ var mainvue_type_template_id_3a307e68_render = function () {
                 "es-table-border-none": _vm.border == "none",
                 "es-table-plus": _vm.mode == "plus",
               },
-              staticStyle: {},
+              style: _vm.styles,
             },
             [
               _c(
@@ -4092,7 +4093,11 @@ var mainvue_type_template_id_3a307e68_render = function () {
                         ? [
                             item.type === "sort"
                               ? _c("el-table-column", {
-                                  key: item.key || index,
+                                  key:
+                                    item.key ||
+                                    item.label ||
+                                    item.title ||
+                                    index,
                                   attrs: {
                                     width: "32",
                                     prop: "id",
@@ -4103,12 +4108,14 @@ var mainvue_type_template_id_3a307e68_render = function () {
                                       key: "default",
                                       fn: function (scope) {
                                         return [
-                                          _c("es-icon", {
-                                            staticClass: "es-move",
-                                            attrs: {
-                                              contents: _vm.dragSortIcon,
-                                            },
-                                          }),
+                                          !scope.row.fixed
+                                            ? _c("es-icon", {
+                                                staticClass: "es-move",
+                                                attrs: {
+                                                  contents: _vm.dragSortIcon,
+                                                },
+                                              })
+                                            : _vm._e(),
                                         ]
                                       },
                                     },
@@ -4119,7 +4126,13 @@ var mainvue_type_template_id_3a307e68_render = function () {
                               ? _c(
                                   "el-table-column",
                                   _vm._b(
-                                    { key: item.key || index },
+                                    {
+                                      key:
+                                        item.key ||
+                                        item.label ||
+                                        item.title ||
+                                        index,
+                                    },
                                     "el-table-column",
                                     _vm.dragSort
                                       ? Object.assign({}, item, {
@@ -4129,42 +4142,46 @@ var mainvue_type_template_id_3a307e68_render = function () {
                                     false
                                   )
                                 )
-                              : _c(
-                                  "children",
-                                  _vm._g(
-                                    _vm._b(
-                                      {
-                                        key: item.label || item.title,
-                                        attrs: { tag: item.tag },
-                                      },
-                                      "children",
-                                      Object.assign(
-                                        {},
-                                        {
-                                          mode: _vm.mode,
-                                          name: _vm.name,
-                                          indexs: index,
-                                          form: _vm.form,
-                                          readonly: _vm.readonly,
-                                          optionData: _vm.optionDatas,
-                                          dragSort: _vm.dragSort,
-                                        },
-                                        _vm.dragSort
-                                          ? Object.assign({}, item, {
-                                              fixed: false,
-                                            })
-                                          : item
+                              : [
+                                  _c(
+                                    "children",
+                                    _vm._g(
+                                      _vm._b(
+                                        { attrs: { tag: item.tag } },
+                                        "children",
+                                        Object.assign(
+                                          {},
+                                          {
+                                            mode: _vm.mode,
+                                            name: _vm.name,
+                                            indexs: index,
+                                            form: _vm.form,
+                                            readonly: _vm.readonly,
+                                            optionData: _vm.optionDatas,
+                                            dragSort: _vm.dragSort,
+                                            key:
+                                              item.key ||
+                                              item.label ||
+                                              item.title ||
+                                              index,
+                                          },
+                                          _vm.dragSort
+                                            ? Object.assign({}, item, {
+                                                fixed: false,
+                                              })
+                                            : Object.assign({}, item)
+                                        ),
+                                        false
                                       ),
-                                      false
-                                    ),
-                                    {
-                                      handleClick: _vm.handleClick,
-                                      formBlur: _vm.formBlur,
-                                      formFocus: _vm.formFocus,
-                                      formChange: _vm.formChange,
-                                    }
-                                  )
-                                ),
+                                      {
+                                        handleClick: _vm.handleClick,
+                                        formBlur: _vm.formBlur,
+                                        formFocus: _vm.formFocus,
+                                        formChange: _vm.formChange,
+                                      }
+                                    )
+                                  ),
+                                ],
                           ]
                         : _vm._e(),
                     ]
@@ -4273,19 +4290,37 @@ var mainvue_type_template_id_3a307e68_render = function () {
             2
           )
         : _vm._e(),
-      _c("sizer", {
-        ref: "sizer",
-        attrs: { data: _vm.theads, mode: _vm.mode },
-      }),
+      _vm.theads.length
+        ? _c(
+            "es-dialog",
+            {
+              attrs: { title: "列表设置", visible: _vm.showSizer },
+              on: {
+                "update:visible": function ($event) {
+                  _vm.showSizer = $event
+                },
+              },
+            },
+            [
+              _vm.showSizer
+                ? _c("sizer", {
+                    attrs: { data: _vm.theads, mode: _vm.mode },
+                    on: { confirm: _vm.mergeThead },
+                  })
+                : _vm._e(),
+            ],
+            1
+          )
+        : _vm._e(),
     ],
     1
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_3a307e68_render._withStripped = true
+mainvue_type_template_id_d6bac15c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=3a307e68&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=d6bac15c&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4293,8 +4328,8 @@ var api = __webpack_require__(1);
 // EXTERNAL MODULE: external "throttle-debounce"
 var external_throttle_debounce_ = __webpack_require__(11);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
-var childrenvue_type_template_id_44b7ff61_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=271bb842&
+var childrenvue_type_template_id_271bb842_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4311,7 +4346,14 @@ var childrenvue_type_template_id_44b7ff61_render = function () {
                       "children",
                       _vm._g(
                         _vm._b(
-                          { key: index },
+                          {
+                            key:
+                              item.key ||
+                              item.id ||
+                              item.label ||
+                              item.title ||
+                              index,
+                          },
                           "children",
                           Object.assign(
                             {},
@@ -4336,14 +4378,14 @@ var childrenvue_type_template_id_44b7ff61_render = function () {
     2
   )
 }
-var childrenvue_type_template_id_44b7ff61_staticRenderFns = []
-childrenvue_type_template_id_44b7ff61_render._withStripped = true
+var childrenvue_type_template_id_271bb842_staticRenderFns = []
+childrenvue_type_template_id_271bb842_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
+// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=271bb842&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=1dac0447&
-var columnvue_type_template_id_1dac0447_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=ddc4775e&
+var columnvue_type_template_id_ddc4775e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4351,6 +4393,7 @@ var columnvue_type_template_id_1dac0447_render = function () {
     "el-table-column",
     _vm._b(
       {
+        key: _vm.field,
         scopedSlots: _vm._u([
           {
             key: "default",
@@ -5156,11 +5199,11 @@ var columnvue_type_template_id_1dac0447_render = function () {
     2
   )
 }
-var columnvue_type_template_id_1dac0447_staticRenderFns = []
-columnvue_type_template_id_1dac0447_render._withStripped = true
+var columnvue_type_template_id_ddc4775e_staticRenderFns = []
+columnvue_type_template_id_ddc4775e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=1dac0447&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=ddc4775e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -5765,7 +5808,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         label: this.label || this.title,
         width: this.btnWidth || this.width
       };
-
       if (this.type === 'expand') {
         config = _extends({ type: this.type }, config, this.$attrs);
         return config;
@@ -5787,7 +5829,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         config.outside = false;
       }
       var minWidth = this.label || this.title ? (this.label || this.title).length * 14 + 20 : this.width ? '' : '180px';
-      config = _extends({}, config, {
+      return _extends({}, config, {
         filterIcon: this.icon,
         sortable: this.sortable || this.sort,
         minWidth: this.minWidth || this.table.minWidth || minWidth,
@@ -5797,7 +5839,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         prop: this.field || this.prop,
         field: this.field
       }, this.$attrs);
-      return config;
     },
     formOption: function formOption() {
       var config = _extends({
@@ -6108,8 +6149,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_1dac0447_render,
-  columnvue_type_template_id_1dac0447_staticRenderFns,
+  columnvue_type_template_id_ddc4775e_render,
+  columnvue_type_template_id_ddc4775e_staticRenderFns,
   false,
   null,
   null,
@@ -6119,8 +6160,6 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var column = (component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=script&lang=js&
-var _components;
-
 //
 //
 //
@@ -6144,12 +6183,16 @@ var _components;
 
 /* harmony default export */ var childrenvue_type_script_lang_js_ = ({
   name: 'Children',
-  components: (_components = {}, _components[column.name] = column, _components),
+  components: {
+    column: column
+  },
   props: {
     dragSort: Boolean,
     children: Array,
     childHead: Array
   },
+  created: function created() {},
+
   computed: {
     childrens: function childrens() {
       return this.children || this.childHead || [];
@@ -6168,8 +6211,8 @@ var _components;
 
 var children_component = Object(componentNormalizer["a" /* default */])(
   src_childrenvue_type_script_lang_js_,
-  childrenvue_type_template_id_44b7ff61_render,
-  childrenvue_type_template_id_44b7ff61_staticRenderFns,
+  childrenvue_type_template_id_271bb842_render,
+  childrenvue_type_template_id_271bb842_staticRenderFns,
   false,
   null,
   null,
@@ -6178,64 +6221,57 @@ var children_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var children = (children_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=template&id=a70172f8&
-var sizervue_type_template_id_a70172f8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=template&id=24d19bd8&
+var sizervue_type_template_id_24d19bd8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  return _vm.theads.length
-    ? _c(
-        "es-dialog",
-        {
-          attrs: { title: "设置", visible: _vm.visible },
-          on: {
-            "update:visible": function ($event) {
-              _vm.visible = $event
-            },
-          },
+  return _c(
+    "div",
+    { staticClass: "es-table-sizer" },
+    [
+      _c("div", { staticClass: "es-table-sizer-tips" }, [
+        _vm._v("\n    提示：锁定的列排序无效，列的内容是数字才能合计\n  "),
+      ]),
+      _c("es-data-table", {
+        attrs: {
+          dragSort: "",
+          numbers: "",
+          form: "",
+          "row-key": "id",
+          "default-expand-all": "",
+          height: "480px",
+          mode: _vm.mode,
+          data: _vm.theads,
+          thead: _vm.thead,
+          "tree-props": { children: "childHead" },
         },
+        on: { change: _vm.handleChange, "update-drag-sort": _vm.handleDrag },
+      }),
+      _c(
+        "div",
+        { staticClass: "sizer-btn-box" },
         [
-          _vm.visible
-            ? _c("es-data-table", {
-                attrs: {
-                  numbers: "",
-                  form: "",
-                  "row-key": "id",
-                  "default-expand-all": "",
-                  height: "500px",
-                  mode: _vm.mode,
-                  data: _vm.theads,
-                  thead: _vm.thead,
-                  "tree-props": { children: "childHead" },
-                },
-                on: { change: _vm.handleChange },
-              })
-            : _vm._e(),
           _c(
-            "div",
-            { staticClass: "sizer-btn-box" },
-            [
-              _c(
-                "el-button",
-                {
-                  attrs: { type: "primary", size: "medium" },
-                  on: { click: _vm.handleConfirm },
-                },
-                [_vm._v("确定")]
-              ),
-            ],
-            1
+            "el-button",
+            {
+              attrs: { type: "primary", size: "medium" },
+              on: { click: _vm.handleConfirm },
+            },
+            [_vm._v("确定")]
           ),
         ],
         1
-      )
-    : _vm._e()
+      ),
+    ],
+    1
+  )
 }
-var sizervue_type_template_id_a70172f8_staticRenderFns = []
-sizervue_type_template_id_a70172f8_render._withStripped = true
+var sizervue_type_template_id_24d19bd8_staticRenderFns = []
+sizervue_type_template_id_24d19bd8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=template&id=a70172f8&
+// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=template&id=24d19bd8&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=script&lang=js&
 var sizervue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -6266,6 +6302,10 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 //
 //
 //
+//
+//
+//
+//
 
 
 /* harmony default export */ var sizervue_type_script_lang_js_ = ({
@@ -6278,9 +6318,9 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     theads: {
       get: function get() {
         if (this.data && this.data.length) {
-          var thead = [];
-          this.getThead(this.data, thead);
-          return thead;
+          var newData = [];
+          this.getThead(this.data, newData);
+          return newData;
         }
         return [];
       }
@@ -6290,10 +6330,10 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     return {
       visible: false,
       thead: [{
-        title: '标题',
+        title: '名称',
         field: 'title'
       }, {
-        title: '列固定位置',
+        title: '锁定列位置',
         field: 'fixed',
         type: 'select',
         clearable: true,
@@ -6306,7 +6346,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           name: '右'
         }]
       }, {
-        title: '显示列',
+        title: '列是否显示',
         field: 'hide',
         type: 'switch',
         width: 160,
@@ -6318,9 +6358,22 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           value: true,
           name: '显示'
         }]
+      }, {
+        title: '是否开启合计',
+        field: 'total',
+        type: 'switch',
+        width: 160,
+        align: 'center',
+        data: [{
+          value: false,
+          name: '关闭'
+        }, {
+          value: true,
+          name: '开启'
+        }]
       }],
-      id: 1,
-      newThead: []
+      newThead: [],
+      nid: 0
     };
   },
   mounted: function mounted() {
@@ -6334,8 +6387,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     getThead: function getThead(res, data) {
       var _this = this;
 
-      res.forEach(function (item) {
-        if (item.type !== 'index' && item.type !== 'selection' && item.type !== 'handle') {
+      res.forEach(function (item, index) {
+        if (item.type !== 'index' && item.type !== 'selection') {
           var fixed = item.fixed,
               hide = item.hide,
               childHead = item.childHead,
@@ -6347,9 +6400,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             title: title ? title : item.label,
             fixed: fixed === true ? 'left' : fixed === undefined || fixed === false ? '' : fixed,
             hide: hide ? false : true,
-            id: _this.id
+            id: index
           }, other);
-          _this.id++;
           if (childHead && childHead.length) {
             var childHeads = [];
             _this.getThead(childHead, childHeads);
@@ -6361,6 +6413,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             items.children = _childHeads;
           }
           data.push(items);
+        } else {
+          _this.nid++;
         }
       });
     },
@@ -6388,10 +6442,23 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     handleChange: function handleChange(res) {
       this.setThead(res, this.newThead);
     },
+    handleDrag: function handleDrag(res, evt) {
+      var oldIndex = evt.oldIndex,
+          newIndex = evt.newIndex;
+
+      oldIndex += this.nid;
+      newIndex += this.nid;
+      if (oldIndex > newIndex) {
+        this.newThead.splice(newIndex, 0, this.newThead[oldIndex]);
+        this.newThead.splice(oldIndex + 1, 1);
+      } else {
+        this.newThead.splice(newIndex + 1, 0, this.newThead[oldIndex]);
+        this.newThead.splice(oldIndex, 1);
+      }
+    },
     handleConfirm: function handleConfirm() {
       this.visible = false;
-      this.$parent.show = false;
-      this.$parent.mergeThead(this.newThead);
+      this.$emit('confirm', this.newThead);
     }
   }
 });
@@ -6407,8 +6474,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
 var sizer_component = Object(componentNormalizer["a" /* default */])(
   src_sizervue_type_script_lang_js_,
-  sizervue_type_template_id_a70172f8_render,
-  sizervue_type_template_id_a70172f8_staticRenderFns,
+  sizervue_type_template_id_24d19bd8_render,
+  sizervue_type_template_id_24d19bd8_staticRenderFns,
   false,
   null,
   null,
@@ -6429,8 +6496,18 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
 
 var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var mainvue_type_script_lang_js_components;
-
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -6617,10 +6694,14 @@ var mainvue_type_script_lang_js_components;
 
 
 var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* default */].win.systemMode || 'default';
+var pageView = util["a" /* default */].getParams('pageView');
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsDataTable',
   inheritAttrs: false,
-  components: (mainvue_type_script_lang_js_components = {}, mainvue_type_script_lang_js_components[children.name] = children, mainvue_type_script_lang_js_components[sizer.name] = sizer, mainvue_type_script_lang_js_components),
+  components: {
+    children: children,
+    sizer: sizer
+  },
   provide: function provide() {
     return {
       table: this,
@@ -6640,6 +6721,14 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
     }
   },
   props: {
+    viewCode: {
+      type: String,
+      default: pageView
+    },
+    contentsUrl: {
+      type: String,
+      default: api["y" /* formContents */]
+    },
     mode: {
       type: String,
       default: systemMode
@@ -6874,12 +6963,14 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       type: String,
       default: 'es-icon-caidan'
     },
-    fields: Boolean
+    isFieldsEncryption: Boolean
   },
   data: function data() {
     return {
+      isEncryption: this.isFieldsEncryption,
       requests: [],
       toolbars: [],
+      hasThead: false,
       theadData: [],
       list: [],
       tableLoading: this.loading,
@@ -6902,10 +6993,12 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       selected: null,
       options: {},
       icon: true,
-      show: true,
       sysCodes: [],
       infiniteDisabled: this.infiniteScroll,
-      isReload: false
+      isReload: false,
+      pageView: null,
+      showSizer: false,
+      show: true
     };
   },
 
@@ -6927,13 +7020,14 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       get: function get() {
         var _this = this;
 
-        var thead = [];
-        var addfilter = false;
-        var types = this.theadData.filter(function (item) {
+        var types = void 0;
+        types = this.theadData.filter(function (item) {
           return item.type == 'selection' || item.type == 'index' || item.type == 'sort';
         }).map(function (item) {
           return item.type;
         });
+        var thead = [];
+        var addfilter = false;
         if (this.dragSort && !types.includes('sort')) {
           addfilter = true;
           thead.push({
@@ -6983,7 +7077,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
         }
         if (this.theadData.length) {
           thead = [].concat(thead, this.theadData);
-        } else {
+        } else if (this.show) {
           thead = [].concat(thead, this.thead);
         }
         return thead;
@@ -7070,6 +7164,15 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
     }
   },
   watch: {
+    viewCode: {
+      immediate: true,
+      handler: function handler(val) {
+        if (val) {
+          this.hasThead = true;
+          this.getContents();
+        }
+      }
+    },
     showToolbar: function showToolbar() {
       this.resetHeight();
       this.doLayout();
@@ -7106,8 +7209,8 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       deep: true,
       handler: function handler(val) {
         this.getOptions(val);
-
-        if (Array.isArray(val) && val.length && this.fields && this.datas.length == 0) {
+        this.chekOpenTotalArea();
+        if (Array.isArray(val) && val.length && this.datas.length == 0) {
           this.getTableData();
         }
       }
@@ -7176,15 +7279,9 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
   created: function created() {
     if (Array.isArray(this.thead) && this.thead.length) {
       this.getOptions(this.thead);
-      if (this.fields) {
-        this.immediate && this.getTableData();
-        this.chekOpenTotalArea();
-      }
-    }
-    if (!this.fields) {
       this.immediate && this.getTableData();
-      this.chekOpenTotalArea();
     }
+    this.chekOpenTotalArea();
   },
   mounted: function mounted() {
     if (this.data.length) {
@@ -7219,56 +7316,79 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
 
       return [method, url, external_qs_default.a.stringify(params), external_qs_default.a.stringify(data)].join('&');
     },
-    getOptions: function getOptions(res) {
+    getContents: function getContents() {
       var _this6 = this;
 
+      util["a" /* default */].ajax({
+        url: this.contentsUrl,
+        params: {
+          formId: this.viewCode
+        }
+      }).then(function (res) {
+        if (res.rCode == 0) {
+          var eossFormJson = res.results.eossFormJson;
+
+          eossFormJson = JSON.parse(eossFormJson);
+          if (eossFormJson && eossFormJson.table) {
+            _this6.isEncryption = true;
+            _this6.theadData = eossFormJson.table;
+          } else {
+            _this6.hasThead = false;
+          }
+          _this6.$emit('init-contents', res.results);
+        }
+      });
+    },
+    getOptions: function getOptions(res) {
+      var _this7 = this;
+
       var sysCodes = [];
       res.forEach(function (item) {
         if (item.sysCode || item.url) {
           item.sysCode && sysCodes.push(item.sysCode);
           var params = util["a" /* default */].extend({}, item.sysCode ? { sysAppCode: item.sysCode, code: item.sysCode } : {}, item.param ? item.param : {});
-          var key = _this6.getRequestKey({
-            method: _this6.method,
-            url: item.sysCode ? _this6.findCode : item.url,
+          var key = _this7.getRequestKey({
+            method: _this7.method,
+            url: item.sysCode ? _this7.findCode : item.url,
             params: params,
             data: {}
           });
-          if (!_this6.requests.includes(key)) {
+          if (!_this7.requests.includes(key)) {
             util["a" /* default */].ajax({
-              url: item.sysCode ? _this6.findCode : item.url,
-              method: _this6.method,
+              url: item.sysCode ? _this7.findCode : item.url,
+              method: _this7.method,
               params: params,
               data: params
             }).then(function (res) {
               if (res.rCode === 0) {
                 if (item.type == 'ganged') {
-                  _this6.$set(_this6.options, item.sysCode || item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
+                  _this7.$set(_this7.options, item.sysCode || item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
                   if (item.sysCode) {
-                    bus["a" /* default */].$emit(item.sysCode, JSON.parse(JSON.stringify(_this6.options[item.sysCode])));
+                    bus["a" /* default */].$emit(item.sysCode, JSON.parse(JSON.stringify(_this7.options[item.sysCode])));
                   }
                 } else {
-                  _this6.$set(_this6.options, item.sysCode || item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
+                  _this7.$set(_this7.options, item.sysCode || item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
                   if (item.sysCode) {
                     bus["a" /* default */].$emit(item.sysCode, JSON.parse(JSON.stringify(res.results)));
                   }
                 }
-                _this6.requests.push(key);
+                _this7.requests.push(key);
               } else {
                 var msg = res.msg || '系统错误，请联系管理员！';
-                _this6.$message.error(msg);
+                _this7.$message.error(msg);
               }
             }).catch(function (err) {
               if (err.message && err.message !== 'canceled') {
-                _this6.$message.error(err.message);
+                _this7.$message.error(err.message);
               }
             });
           }
         } else {
           if (item.childHead && item.childHead.length) {
-            _this6.getOptions(item.childHead);
+            _this7.getOptions(item.childHead);
           }
           if (item.children && item.children.length) {
-            _this6.getOptions(item.children);
+            _this7.getOptions(item.children);
           }
         }
       });
@@ -7280,18 +7400,26 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       return util["a" /* default */].getObjectType(item) === 'object';
     },
     chekOpenTotalArea: function chekOpenTotalArea() {
-      var _this7 = this;
+      var _this8 = this;
 
       if (this.total || this.showSummary) {
         this.showTotal = true;
         return;
       }
+      if (!this.theads) {
+        return;
+      }
       var arr = JSON.parse(JSON.stringify(this.theads));
+      var flag = false;
       arr.forEach(function (item) {
         if (item.total) {
-          _this7.showTotal = true;
+          flag = true;
+          _this8.showTotal = true;
         }
       });
+      if (this.showTotal !== flag) {
+        this.showTotal = flag;
+      }
     },
     rowClick: function rowClick(row, column, event) {
       this.$emit('click', row, column, event);
@@ -7336,13 +7464,13 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       }
     },
     getRow: function getRow(thead, obj) {
-      var _this8 = this;
+      var _this9 = this;
 
       thead.forEach(function (item) {
         if (item.field) {
           obj[item['field']] = item.defaultValue || '';
         } else if (item.children && item.children.length) {
-          _this8.getRow(item.children, obj);
+          _this9.getRow(item.children, obj);
         }
       });
     },
@@ -7369,27 +7497,37 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       });
     },
     checkSelect: function checkSelect(newVal) {
-      var _this9 = this;
+      var _this10 = this;
 
       this.$nextTick(function () {
         if (util["a" /* default */].getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
             if (util["a" /* default */].isObject(row)) {
-              _this9.$refs.oaTable.toggleRowSelection(row, true);
-            } else _this9.list.forEach(function (item) {
-              if (item[_this9.checkedKey] === row) {
-                _this9.$refs.oaTable.toggleRowSelection(item, true);
-                return;
-              }
-            });
+              _this10.$refs.oaTable.toggleRowSelection(row, true);
+            } else {
+              _this10.setChecked(_this10.list, row);
+            }
           });
         } else if (newVal === true) {
-          _this9.toggleAllSelection();
+          _this10.toggleAllSelection();
+        }
+      });
+    },
+    setChecked: function setChecked(list, row) {
+      var _this11 = this;
+
+      list.forEach(function (item) {
+        if (item.children && item.children.length) {
+          _this11.setChecked(item.children, row);
+        }
+        if (item[_this11.checkedKey] === row) {
+          _this11.$refs.oaTable.toggleRowSelection(item, true);
+          return;
         }
       });
     },
     getTableDatas: function getTableDatas(res) {
-      var _this10 = this;
+      var _this12 = this;
 
       var where = void 0;
       var first = void 0;
@@ -7411,6 +7549,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       if (where) {
         reqData = util["a" /* default */].extend({}, reqData, where);
       }
+      //if (this.fields)
       if (this.retainSearh || first === false) {
         reqData = util["a" /* default */].extend({}, reqData, this.wheres);
       }
@@ -7421,9 +7560,9 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
           }
         }
       }
-      if (this.fields) {
+      if (this.isEncryption) {
         var fields = [];
-        this.thead.forEach(function (item) {
+        this.theads.forEach(function (item) {
           if (item.field || item.prop) {
             fields.push(item.field || item.prop);
           }
@@ -7443,43 +7582,43 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
         params: reqData,
         data: reqData
       })).then(function (res) {
-        _this10.tableLoading = false;
+        _this12.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
-          if (_this10.isReload) {
-            _this10.list = [];
-            _this10.isReload = false;
+          if (_this12.isReload) {
+            _this12.list = [];
+            _this12.isReload = false;
           }
-          var results = _this10.parseData !== undefined ? _this10.parseData(res.results || res.data || res) : res.results || res.data;
-          if (_this10.infiniteScroll) {
-            _this10.list = _this10.list.concat(results.data || results.records || results.list);
-            _this10.config.pageNum += 1;
+          var results = _this12.parseData !== undefined ? _this12.parseData(res.results || res.data || res) : res.results || res.data;
+          if (_this12.infiniteScroll) {
+            _this12.list = _this12.list.concat(results.data || results.records || results.list);
+            _this12.config.pageNum += 1;
           } else {
-            _this10.list = results.data || results.records || results.list;
-            _this10.$nextTick(function () {
-              _this10.$refs.oaTable && _this10.$refs.oaTable.resetScroll && _this10.$refs.oaTable.resetScroll(0, 0);
+            _this12.list = results.data || results.records || results.list;
+            _this12.$nextTick(function () {
+              _this12.$refs.oaTable && _this12.$refs.oaTable.resetScroll && _this12.$refs.oaTable.resetScroll(0, 0);
             });
           }
-          _this10.config.totalCount = results.count || results.total || results.totalCount;
-          _this10.config.pageCount = results.pageCount;
-          _this10.checked && _this10.$nextTick(function () {
-            _this10.checkSelect(_this10.checked);
+          _this12.config.totalCount = results.count || results.total || results.totalCount;
+          _this12.config.pageCount = results.pageCount;
+          _this12.checked && _this12.$nextTick(function () {
+            _this12.checkSelect(_this12.checked);
           });
-          if (_this10.infiniteScroll && _this10.config.totalCount === _this10.list.length) {
-            _this10.infiniteDisabled = true;
+          if (_this12.infiniteScroll && _this12.config.totalCount === _this12.list.length) {
+            _this12.infiniteDisabled = true;
           }
         } else {
-          _this10.list = [];
+          _this12.list = [];
           //this.tableHeight = false;
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this10.$message.error(msg);
+          _this12.$message.error(msg);
         }
-        _this10.$emit('success', res);
+        _this12.$emit('success', res);
       }).catch(function (err) {
         //this.tableHeight = false;
         if (err.message && err.message !== 'canceled') {
-          _this10.$message.error(err.message);
+          _this12.$message.error(err.message);
         }
-        _this10.tableLoading = false;
+        _this12.tableLoading = false;
       });
     },
     selectionChange: function selectionChange(data) {
@@ -7524,7 +7663,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       this.$emit('change', data, this.list);
     },
     handleAjax: function handleAjax(handle, row) {
-      var _this11 = this;
+      var _this13 = this;
 
       this.changeLoading(true, handle.text + '\u4E2D...');
       var params = handle.param || {};
@@ -7580,9 +7719,9 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
         method: handle.method,
         format: handle.format
       })).then(function (res) {
-        _this11.changeLoading(false);
+        _this13.changeLoading(false);
         if (res.rCode === 0) {
-          _this11.$message({
+          _this13.$message({
             message: handle.text + '\u6210\u529F',
             duration: 2000,
             type: 'success',
@@ -7590,17 +7729,17 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
               var first = Object.prototype.hasOwnProperty.call(handle, 'first') ? handle.first : false;
               var reload = handle.reload || true;
               if (reload) {
-                _this11.reload({}, first);
+                _this13.reload({}, first);
               }
             }
           });
         } else {
-          _this11.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
+          _this13.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
         }
       }).catch(function (err) {
-        _this11.changeLoading(false);
+        _this13.changeLoading(false);
         if (err.message && err.message !== 'canceled') {
-          _this11.$message.error(err.message);
+          _this13.$message.error(err.message);
         }
       });
     },
@@ -7625,7 +7764,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       return mainvue_type_script_lang_js_extends({}, obj, item);
     },
     handleClick: function handleClick(res) {
-      var _this12 = this;
+      var _this14 = this;
 
       var row = res.row,
           handle = res.handle;
@@ -7661,7 +7800,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this12.handleAjax(handle, rows);
+            _this14.handleAjax(handle, rows);
           }).catch(function () {});
         } else {
           this.handleAjax(handle, rows);
@@ -7749,7 +7888,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
           var type = ['selection', 'index', 'expand'];
           thead = thead.map(function (item) {
             return item.filter(function (ele) {
-              return !type.includes(ele.type) && ele.label !== text && !_this12.exportExcludeLabel.includes(ele.label);
+              return !type.includes(ele.type) && ele.label !== text && !_this14.exportExcludeLabel.includes(ele.label);
             });
           });
           util["a" /* default */].exportXls({
@@ -7850,40 +7989,43 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       }
     },
     resetHeight: function resetHeight(warn) {
-      var _this13 = this;
+      var _this15 = this;
 
       this.$nextTick(function () {
-        if (_this13.full && !_this13.height && !_this13.maxHeight) {
-          var height = _this13.$el.parentNode.offsetHeight;
+        if (_this15.full && !_this15.height && !_this15.maxHeight) {
+          var height = _this15.$el.parentNode.offsetHeight;
           if (height) {
-            height = parseInt(util["a" /* default */].getStyle(_this13.$el.parentNode, 'height', '%'), 10);
-            height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(_this13.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(_this13.$el.parentNode, 'padding-bottom'), 10);
-            for (var i = 0; i < _this13.$el.parentNode.childNodes.length; i++) {
-              var ele = _this13.$el.parentNode.childNodes[i];
-              if (ele !== _this13.$el && ele.offsetHeight !== undefined) {
+            height = parseInt(util["a" /* default */].getStyle(_this15.$el.parentNode, 'height', '%'), 10);
+            height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(_this15.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(_this15.$el.parentNode, 'padding-bottom'), 10);
+            for (var i = 0; i < _this15.$el.parentNode.childNodes.length; i++) {
+              var ele = _this15.$el.parentNode.childNodes[i];
+              if (ele.offsetHeight !== undefined) {
                 height = height - ele.offsetHeight - parseInt(util["a" /* default */].getStyle(ele, 'margin-top'), 10) - parseInt(util["a" /* default */].getStyle(ele, 'margin-bottom'), 10);
               }
             }
-            height -= _this13.showToolbar ? _this13.$refs.toolbar.$el.offsetHeight : 0;
-            height -= _this13.page === false ? 0 : _this13.$refs.pagination.$el.offsetHeight;
-            height -= _this13.title ? _this13.$refs.title.offsetHeight : 0;
-            height -= parseInt(util["a" /* default */].getStyle(_this13.$refs.esTableContent, 'padding-top'), 10);
-            height -= parseInt(util["a" /* default */].getStyle(_this13.$refs.esTableContent, 'padding-bottom'), 10);
-            var emptyText = _this13.$refs.esTableContent.querySelector('.el-table__empty-text');
+            height -= _this15.showToolbar ? _this15.$refs.toolbar.$el.offsetHeight : 0;
+            height -= _this15.page === false ? 0 : _this15.$refs.pagination.$el.offsetHeight;
+            height -= _this15.title ? _this15.$refs.title.offsetHeight : 0;
+            height -= parseInt(util["a" /* default */].getStyle(_this15.$refs.esTableContent, 'padding-top'), 10);
+            height -= parseInt(util["a" /* default */].getStyle(_this15.$refs.esTableContent, 'padding-bottom'), 10);
+            var emptyText = _this15.$refs.esTableContent.querySelector('.el-table__empty-text');
+            if (_this15.total) {
+              height -= 1;
+            }
             var eht = 0;
             if (emptyText) {
               eht = emptyText.offsetHeight;
-              var thead = _this13.$refs.esTableContent.querySelector('.el-table__header');
+              var thead = _this15.$refs.esTableContent.querySelector('.el-table__header');
               thead && (eht += thead.offsetHeight);
             }
             if (height > 1 && height - eht > 1) {
-              _this13.tableHeight = height;
+              _this15.tableHeight = height;
             } else {
-              console.warn(_this13.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
+              console.warn(_this15.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
             }
           } else if (!warn) {
             setTimeout(function () {
-              _this13.resetHeight(true);
+              _this15.resetHeight(true);
             }, 1000);
           }
         }
@@ -7904,7 +8046,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       }
     },
     handleFilterColumn: function handleFilterColumn() {
-      this.$refs.sizer.show();
+      this.showSizer = true;
     },
     handleSortChange: function handleSortChange(res) {
       if (res.data && res.data.length) {
@@ -7916,31 +8058,44 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
       this.$emit('update-drag-sort', data, event);
     },
     mergeThead: function mergeThead(res) {
-      var _this14 = this;
+      var _this16 = this;
 
-      this.theadData = res;
+      this.show = false;
+      this.theadData = [];
       this.icon = true;
-      setTimeout(function () {
-        _this14.show = true;
-      }, 100);
+      this.showSizer = false;
+      // if (!this.showTotal) {
+      //   for (let i = 0; i < res.length; i++) {
+      //     if (res[i].total) {
+      //       this.showTotal = true;
+      //       break;
+      //     }
+      //   }
+      // }
+      this.$nextTick(function () {
+        _this16.theadData = res;
+        setTimeout(function () {
+          _this16.show = true;
+        }, 500);
+      });
     },
     setOptions: function setOptions(val, sysCode) {
       this.$set(this.options, sysCode, val);
     },
     bindEventBus: function bindEventBus() {
-      var _this15 = this;
+      var _this17 = this;
 
       this.sysCodes.forEach(function (item) {
         bus["a" /* default */].$on(item, function (val) {
-          _this15.setOptions(val, item);
+          _this17.setOptions(val, item);
         });
       });
     },
     unbindEventBus: function unbindEventBus() {
-      var _this16 = this;
+      var _this18 = this;
 
       this.sysCodes.forEach(function (item) {
-        bus["a" /* default */].$off(item, _this16.setOptions);
+        bus["a" /* default */].$off(item, _this18.setOptions);
       });
     },
     reset: function reset() {
@@ -7960,7 +8115,7 @@ var systemMode = util["a" /* default */].win.top.systemMode || util["a" /* defau
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3a307e68_render,
+  mainvue_type_template_id_d6bac15c_render,
   staticRenderFns,
   false,
   null,