Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-2 13:20:15 */
+/*! time: 2021-8-3 16:10:14 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -102423,7 +102423,7 @@ if (typeof Set !== "undefined" && Set.toString().match(/native code/)) {
     }
 
     function initMixins(vm, mixins) {
-        mixins = mixins || [];
+        mixins = (mixins || []).slice(0);
 
         _.each(mixins.reverse(), function (mixinType) {
             var mixin$$1 = getMixins(mixinType);

dist/core.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-2 13:20:15 */
+/*! time: 2021-8-3 16:10:14 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -102261,7 +102261,7 @@ if (typeof Set !== "undefined" && Set.toString().match(/native code/)) {
     }
 
     function initMixins(vm, mixins) {
-        mixins = mixins || [];
+        mixins = (mixins || []).slice(0);
 
         _.each(mixins.reverse(), function (mixinType) {
             var mixin$$1 = getMixins(mixinType);

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-2 13:20:15 */
+/*! time: 2021-8-3 16:10:14 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -102423,7 +102423,7 @@ if (typeof Set !== "undefined" && Set.toString().match(/native code/)) {
     }
 
     function initMixins(vm, mixins) {
-        mixins = mixins || [];
+        mixins = (mixins || []).slice(0);
 
         _.each(mixins.reverse(), function (mixinType) {
             var mixin$$1 = getMixins(mixinType);

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-2 13:20:15 */
+/*! time: 2021-8-3 16:10:14 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -102423,7 +102423,7 @@ if (typeof Set !== "undefined" && Set.toString().match(/native code/)) {
     }
 
     function initMixins(vm, mixins) {
-        mixins = mixins || [];
+        mixins = (mixins || []).slice(0);
 
         _.each(mixins.reverse(), function (mixinType) {
             var mixin$$1 = getMixins(mixinType);

dist/fineui.proxy.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-2 13:20:15 */
+/*! time: 2021-8-3 16:10:14 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -100031,7 +100031,7 @@ module.exports = __webpack_require__(716);
     }
 
     function initMixins(vm, mixins) {
-        mixins = mixins || [];
+        mixins = (mixins || []).slice(0);
 
         _.each(mixins.reverse(), function (mixinType) {
             var mixin = getMixins(mixinType);

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-2 13:20:15 */
+/*! time: 2021-8-3 16:10:14 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -79715,7 +79715,7 @@ var _layout = __webpack_require__(3);
     }
 
     function initMixins(vm, mixins) {
-        mixins = mixins || [];
+        mixins = (mixins || []).slice(0);
 
         _.each(mixins.reverse(), function (mixinType) {
             var mixin$$1 = getMixins(mixinType);

dist/lib/core/decorator/decorator.d.ts

@@ -66,9 +66,7 @@ export declare class Model<U extends {
 } = {}> extends Fix.Model {
     model: Pick<{
         [key in keyof U["types"]]: U["types"][key];
-    }, U["context"][number]> & {
-        [key in keyof ReturnType<this["state"]>]: ReturnType<this["state"]>[key];
-    } & {
+    }, U["context"][number]> & ReturnType<this["state"]> & {
         [key in keyof this["computed"]]: ReturnType<this["computed"][key]>;
     };
     store: this["actions"];

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-2 13:20:15 */
+/*! time: 2021-8-3 16:10:14 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20210802132115",
+  "version": "2.0.20210803161102",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

typescript/core/decorator/decorator.ts

@@ -90,7 +90,7 @@ export function mixins(...Mixins: ({ new (...args: any[]): {} } & { xtype: strin
  */
 export class Model<U extends {types?: {[key: string]: unknown} | {}, context?: ReadonlyArray<string>} = {}> extends Fix.Model {
     // @ts-ignore this["computed"][key]为空
-    model: Pick<{[key in keyof U["types"]]: U["types"][key]}, U["context"][number]> & {[key in keyof ReturnType<this["state"]>]: ReturnType<this["state"]>[key]} & {[key in keyof this["computed"]]: ReturnType<this["computed"][key]>};
+    model: Pick<{[key in keyof U["types"]]: U["types"][key]}, U["context"][number]> & ReturnType<this["state"]> & {[key in keyof this["computed"]]: ReturnType<this["computed"][key]>};
 
     store: this["actions"];