eoss-ui 0.5.81-beta16 → 0.5.81-beta17

package/lib/main.js

@@ -3975,8 +3975,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=d62e142c&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=46b7eb38&scoped=true&
-var simplicityvue_type_template_id_46b7eb38_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=41b0483a&scoped=true&
+var simplicityvue_type_template_id_41b0483a_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4585,11 +4585,11 @@ var simplicityvue_type_template_id_46b7eb38_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_46b7eb38_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_46b7eb38_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_41b0483a_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_41b0483a_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=46b7eb38&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=41b0483a&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=1560e8bf&scoped=true&
 var avatarvue_type_template_id_1560e8bf_scoped_true_render = function () {
@@ -9774,6 +9774,8 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handlerClickMenu: function handlerClickMenu(res) {
+      var _this5 = this;
+
       if (this.recordApp) {
         utils_util["a" /* default */].ajax({
           url: api["mb" /* recordUserApp */],
@@ -9793,6 +9795,16 @@ var events = [function (tabs, index, that) {
       } else {
         if (res.method == 'iframe') {
           res.url = utils_util["a" /* default */].handlerUrl(res.url);
+        } else {
+          var _tab6 = this.tabs[i];
+          if (_tab6.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab6.url));
+          } else {
+            this.$set(this.tabs[i], 'refresh', false);
+            this.$nextTick(function () {
+              _this5.$set(_this5.tabs[i], 'refresh', true);
+            });
+          }
         }
       }
     },
@@ -9843,15 +9855,23 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleRefresh: function handleRefresh() {
+      var _this6 = this;
+
       var i = utils_util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
       var tab = this.tabs[i];
       if (tab.method === 'iframe') {
         tab.url = utils_util["a" /* default */].handlerUrl(tab.url);
+      } else {
+        var _tab7 = this.tabs[i];
+        if (_tab7.method === 'iframe') {
+          this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab7.url));
+        } else {
+          this.$set(this.tabs[i], 'refresh', false);
+          this.$nextTick(function () {
+            _this6.$set(_this6.tabs[i], 'refresh', true);
+          });
+        }
       }
-      tab.refresh = false;
-      this.$nextTick(function () {
-        tab.refresh = true;
-      });
     },
 
     /**
@@ -9929,6 +9949,8 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleClick: function handleClick(res) {
+      var _this7 = this;
+
       var type = res.type,
           event = res.event,
           open = res.open,
@@ -9939,7 +9961,7 @@ var events = [function (tabs, index, that) {
       } else if (open) {
         utils_util["a" /* default */].win.open(open);
       } else if (link) {
-        utils_util["a" /* default */].win.location.href = link;
+        utils_util["a" /* default */].win.open(link, '_self');
       } else {
         switch (type) {
           case 'quit':
@@ -9963,15 +9985,23 @@ var events = [function (tabs, index, that) {
             this.showMsg = false;
             break;
           case 'home':
-            if (this.homePage.id !== this.activeName) {
-              var i = utils_util["a" /* default */].indexOfObj(this.tabs, this.homePage.id, 'id');
-              if (i == -1) {
-                this.tabs.unshift(this.homePage);
+            var i = utils_util["a" /* default */].indexOfObj(this.tabs, this.homePage.id, 'id');
+            if (i == -1) {
+              this.tabs.unshift(this.homePage);
+            } else {
+              var tab = this.tabs[i];
+              if (tab.method === 'iframe') {
+                this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(tab.url));
+              } else {
+                this.$set(this.tabs[i], 'refresh', false);
+                this.$nextTick(function () {
+                  _this7.$set(_this7.tabs[i], 'refresh', true);
+                });
               }
-              this.activeName = this.homePage.id;
-              this.showMsg = false;
-              this.showSet = false;
             }
+            this.activeName = this.homePage.id;
+            this.showMsg = false;
+            this.showSet = false;
             break;
           case 'search':
             this.handlerSetDrawer(res);
@@ -9992,7 +10022,7 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleQuit: function handleQuit() {
-      var _this5 = this;
+      var _this8 = this;
 
       this.$confirm('确定注销吗?', '退出系统', {
         confirmButtonText: '确定',
@@ -10002,8 +10032,8 @@ var events = [function (tabs, index, that) {
         utils_util["a" /* default */].ajax({ method: 'post', url: api["eb" /* logout */] }).then(function (res) {
           if (res.rCode == 0) {
             utils_util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-            if (_this5.onQuit && typeof _this5.onQuit === 'function') {
-              _this5.onQuit();
+            if (_this8.onQuit && typeof _this8.onQuit === 'function') {
+              _this8.onQuit();
             } else {
               try {
                 var loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
@@ -10041,7 +10071,7 @@ var events = [function (tabs, index, that) {
           }
         }).catch(function (err) {
           if (err.message && err.message !== 'canceled') {
-            _this5.$message.error(err.message);
+            _this8.$message.error(err.message);
           }
         });
       }).catch(function (e) {});
@@ -10086,19 +10116,21 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleOpened: function handleOpened(res) {
-      var _this6 = this;
+      var _this9 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this6.sysMsg = [];
+          _this9.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
       }
     },
     jumpMenu: function jumpMenu(res) {
+      var _this10 = this;
+
       var apps = res;
       if (typeof res === 'string') {
         apps = res.split(',');
@@ -10111,6 +10143,16 @@ var events = [function (tabs, index, that) {
         if (i == -1) {
           var tab = this.setIframeType(obj);
           this.tabs.splice(n + 1, 0, tab);
+        } else {
+          var _tab8 = this.tabs[i];
+          if (_tab8.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab8.url));
+          } else {
+            this.$set(this.tabs[i], 'refresh', false);
+            this.$nextTick(function () {
+              _this10.$set(_this10.tabs[i], 'refresh', true);
+            });
+          }
         }
       } else {
         this.$message.error('没有此菜单！');
@@ -10119,13 +10161,13 @@ var events = [function (tabs, index, that) {
 
     //监听改变菜单
     handleListener: function handleListener() {
-      var _this7 = this;
+      var _this11 = this;
 
       utils_util["a" /* default */].win.addEventListener('message', function (e) {
         var msg = e.data;
         if (msg.key == 'jump_Menu') {
           var res = msg.data1;
-          _this7.jumpMenu(res);
+          _this11.jumpMenu(res);
         }
       }, false);
     }
@@ -10150,11 +10192,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_46b7eb38_scoped_true_render,
-  simplicityvue_type_template_id_46b7eb38_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_41b0483a_scoped_true_render,
+  simplicityvue_type_template_id_41b0483a_scoped_true_staticRenderFns,
   false,
   null,
-  "46b7eb38",
+  "41b0483a",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.81-beta16",
+  "version": "0.5.81-beta17",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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>
@@ -460,6 +514,7 @@ export default {
     }
   },
   props: {
+    tag: String,
     mode: String,
     service: String,
     form: Boolean,
@@ -584,8 +639,7 @@ export default {
           : this.valueKey,
         rules: this.rules,
         events: this.events,
-        ...this.$attrs,
-        data: this.option
+        ...this.$attrs
       };
       return config;
     },
@@ -727,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 });
     },
@@ -826,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)
@@ -890,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);

package/packages/data-table/src/{forms.vue → formItem.vue}

@@ -1,16 +1,15 @@
 <template>
   <el-form-item
-    v-if="!(type === 'handle' && !scope.row.hideHandle)"
     :name="name"
     :prop="field || prop"
-    :rules="isNotRule(scope) ? [] : rules"
-    :index="scope.$index"
+    :rules="rules"
+    :index="index"
   >
     <es-select
       v-if="type == 'select'"
       v-bind="formOption"
       :data="option"
-      v-model="scope.row[field || prop]"
+      v-model="model"
       @blur="
         (event) => {
           handleBlur({
@@ -380,16 +379,33 @@
 
 <script>
 export default {
-  name: '',
+  name: 'FormItem',
   components: {},
   props: {
+    scope: {},
     type: String,
-    scope: {}
+    name: String,
+    value: {},
+    index: [String, Number],
+    labelKey: String,
+    valueKey: String,
+    field: String,
+    prop: String,
+    rules: [Array, Object]
   },
   data() {
     return {};
   },
-  computed: {},
+  computed: {
+    model: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit('input', val);
+      }
+    }
+  },
   watch: {},
   created() {},
   mounted() {},

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

@@ -100,6 +100,7 @@
             <children
               v-else
               :key="item.label || item.title"
+              :tag="item.tag"
               v-bind="{
                 mode: mode,
                 name: name,