diff --git a/miniprogram_dev/components/packages/divider/index.wxs b/miniprogram_dev/components/packages/divider/index.wxs index ce8d0a2505395012e0634958b3a42e542e79bc35..b2684dfcdbc9c3ff4b22f0e1b8aa6eab42391ed7 100644 --- a/miniprogram_dev/components/packages/divider/index.wxs +++ b/miniprogram_dev/components/packages/divider/index.wxs @@ -1,11 +1,10 @@ function Classes(data) { - console.log(data) var prefixCls = 'nut-divider' var defaultClassesObj = [prefixCls] if (data.direction === 'horizontal') { - if (data.useSlot) defaultClassesObj.push(prefixCls + '-center') + if (data.contentPosition === 'center') defaultClassesObj.push(prefixCls + '-center') if (data.contentPosition === 'left') defaultClassesObj.push(prefixCls + '-left') if (data.contentPosition === 'right') defaultClassesObj.push(prefixCls + '-right') if (data.dashed) defaultClassesObj.push(prefixCls + '-dashed') diff --git a/miniprogram_dev/components/packages/grid-item/index.js b/miniprogram_dev/components/packages/grid-item/index.js index e483f24f1079cc28fa813c152e9356215ad696b0..59446e9a76e2ef596ec42dd31308e061e83fff79 100644 --- a/miniprogram_dev/components/packages/grid-item/index.js +++ b/miniprogram_dev/components/packages/grid-item/index.js @@ -280,7 +280,7 @@ var _relation = __webpack_require__(2); square: false, border: true, reverse: false, - direction: 'horizontal', + direction: 'vertical', clickable: false }, iconProps: { @@ -289,7 +289,6 @@ var _relation = __webpack_require__(2); }, methods: { updateParent: function updateParent() { - console.log('更新地址', this.parent.data); var that = this; this.setData({ parent: that.parent.data diff --git a/miniprogram_dev/components/packages/grid-item/index.js.map b/miniprogram_dev/components/packages/grid-item/index.js.map index 113a22c1393d3c43846adb8351198c575ddbc588..3acf5d32fbaecdc64f0557935a22c20310276398 100644 --- a/miniprogram_dev/components/packages/grid-item/index.js.map +++ b/miniprogram_dev/components/packages/grid-item/index.js.map @@ -1 +1 @@ -{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/common/component.ts","webpack:///./src/mixins/basic.ts","webpack:///./src/common/relation.ts","webpack:///./src/packages/grid-item/index.ts"],"names":[],"mappings":"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","file":"packages/grid-item/index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 11);\n","import { basic } from '../mixins/basic.ts';\nimport { NutComponentOptions } from '../definitions/index.ts';\n\nfunction mapKeys(\n source: Record,\n target: Record,\n map: Record\n) {\n Object.keys(map).forEach((key) => {\n if (source[key]) {\n target[map[key]] = source[key];\n }\n });\n}\n\nfunction NutComponent<\n Data extends WechatMiniprogram.Component.DataOption,\n Props extends WechatMiniprogram.Component.PropertyOption,\n Methods extends WechatMiniprogram.Component.MethodOption\n>(NutOptions: NutComponentOptions): void {\n const options: WechatMiniprogram.Component.Options = {};\n\n mapKeys(NutOptions, options, {\n data: 'data',\n props: 'properties',\n mixins: 'behaviors',\n methods: 'methods',\n beforeCreate: 'created',\n created: 'attached',\n mounted: 'ready',\n destroyed: 'detached',\n classes: 'externalClasses',\n observers: 'observers'\n });\n\n // add default externalClasses\n options.externalClasses = options.externalClasses || [];\n options.externalClasses.push('custom-class');\n\n // add default behaviors\n options.behaviors = options.behaviors || [];\n options.behaviors.push(basic);\n\n // add relations\n const { relation } = NutOptions;\n if (relation) {\n options.relations = relation.relations;\n options.behaviors.push(relation.mixin);\n }\n \n // map field to form-field behavior\n if (NutOptions.field) {\n options.behaviors.push('wx://form-field');\n }\n\n // 添加默认 选项\n options.options = {\n multipleSlots: true,\n addGlobalClass: true,\n };\n\n Component(options);\n}\n\n\nmodule.exports = { NutComponent };\n","export const basic = Behavior({\n methods: {\n $emit(\n name: string,\n detail?: Record,\n options?: WechatMiniprogram.Component.TriggerEventOption\n ) {\n this.triggerEvent(name, detail, options);\n },\n \n set(data: Record) {\n this.setData(data);\n \n return new Promise((resolve) => wx.nextTick(resolve));\n },\n },\n });\n ","type TrivialInstance = WechatMiniprogram.Component.TrivialInstance;\ntype RelationOption = WechatMiniprogram.Component.RelationOption;\n\nexport function useParent(\n name: string,\n onEffect?: (this: TrivialInstance) => void\n ) {\n const path = `../${name}/index`;\n \n return {\n relations: {\n [path]: {\n type: 'ancestor',\n linked(this: TrivialInstance) {\n onEffect && onEffect.call(this);\n },\n linkChanged(this: TrivialInstance) {\n onEffect && onEffect.call(this);\n },\n unlinked(this: TrivialInstance) {\n onEffect && onEffect.call(this);\n },\n } as RelationOption,\n },\n \n mixin: Behavior({\n created() {\n Object.defineProperty(this, 'parent', {\n get: () => this.getRelationNodes(path)[0],\n });\n \n Object.defineProperty(this, 'index', {\n // @ts-ignore\n get: () => this.parent?.children?.indexOf(this),\n });\n },\n }),\n };\n }\n \n export function useChildren(\n name: string,\n onEffect?: (this: TrivialInstance, target: TrivialInstance) => void\n ) {\n const path = `../${name}/index`;\n return {\n relations: {\n [path]: {\n type: 'descendant',\n linked(this: TrivialInstance, target) {\n onEffect && onEffect.call(this, target);\n },\n linkChanged(this: TrivialInstance, target) {\n onEffect && onEffect.call(this, target);\n },\n unlinked(this: TrivialInstance, target) {\n onEffect && onEffect.call(this, target);\n },\n } as RelationOption,\n },\n \n mixin: Behavior({\n created() {\n Object.defineProperty(this, 'children', {\n get: () => this.getRelationNodes(path) || [],\n });\n },\n }),\n };\n }","import { NutComponent } from './../../common/component.ts'\r\nimport { useParent } from '../../common/relation.ts'\r\n\r\nNutComponent({\r\n relation: useParent('grid'),\r\n props: {\r\n text: String,\r\n // icon\r\n icon: String,\r\n iconSize: Number,\r\n iconColor: String,\r\n replace: {\r\n type: Boolean,\r\n value: false\r\n }\r\n },\r\n\r\n data:{\r\n parent:{\r\n columnNum:4,\r\n gutter:0,\r\n center:true,\r\n square:false,\r\n border:true,\r\n reverse:false,\r\n direction:'horizontal',\r\n clickable:false\r\n },\r\n iconProps:{\r\n name:'',\r\n\r\n }\r\n },\r\n\r\n methods: {\r\n updateParent:function(){\r\n console.log('更新地址',this.parent.data)\r\n const that = this\r\n this.setData({\r\n parent:that.parent.data\r\n })\r\n\r\n }\r\n },\r\n});\r\n\r\n\r\n"],"sourceRoot":""} \ No newline at end of file +{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/common/component.ts","webpack:///./src/mixins/basic.ts","webpack:///./src/common/relation.ts","webpack:///./src/packages/grid-item/index.ts"],"names":[],"mappings":"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","file":"packages/grid-item/index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 11);\n","import { basic } from '../mixins/basic.ts';\nimport { NutComponentOptions } from '../definitions/index.ts';\n\nfunction mapKeys(\n source: Record,\n target: Record,\n map: Record\n) {\n Object.keys(map).forEach((key) => {\n if (source[key]) {\n target[map[key]] = source[key];\n }\n });\n}\n\nfunction NutComponent<\n Data extends WechatMiniprogram.Component.DataOption,\n Props extends WechatMiniprogram.Component.PropertyOption,\n Methods extends WechatMiniprogram.Component.MethodOption\n>(NutOptions: NutComponentOptions): void {\n const options: WechatMiniprogram.Component.Options = {};\n\n mapKeys(NutOptions, options, {\n data: 'data',\n props: 'properties',\n mixins: 'behaviors',\n methods: 'methods',\n beforeCreate: 'created',\n created: 'attached',\n mounted: 'ready',\n destroyed: 'detached',\n classes: 'externalClasses',\n observers: 'observers'\n });\n\n // add default externalClasses\n options.externalClasses = options.externalClasses || [];\n options.externalClasses.push('custom-class');\n\n // add default behaviors\n options.behaviors = options.behaviors || [];\n options.behaviors.push(basic);\n\n // add relations\n const { relation } = NutOptions;\n if (relation) {\n options.relations = relation.relations;\n options.behaviors.push(relation.mixin);\n }\n \n // map field to form-field behavior\n if (NutOptions.field) {\n options.behaviors.push('wx://form-field');\n }\n\n // 添加默认 选项\n options.options = {\n multipleSlots: true,\n addGlobalClass: true,\n };\n\n Component(options);\n}\n\n\nmodule.exports = { NutComponent };\n","export const basic = Behavior({\n methods: {\n $emit(\n name: string,\n detail?: Record,\n options?: WechatMiniprogram.Component.TriggerEventOption\n ) {\n this.triggerEvent(name, detail, options);\n },\n \n set(data: Record) {\n this.setData(data);\n \n return new Promise((resolve) => wx.nextTick(resolve));\n },\n },\n });\n ","type TrivialInstance = WechatMiniprogram.Component.TrivialInstance;\ntype RelationOption = WechatMiniprogram.Component.RelationOption;\n\nexport function useParent(\n name: string,\n onEffect?: (this: TrivialInstance) => void\n ) {\n const path = `../${name}/index`;\n \n return {\n relations: {\n [path]: {\n type: 'ancestor',\n linked(this: TrivialInstance) {\n onEffect && onEffect.call(this);\n },\n linkChanged(this: TrivialInstance) {\n onEffect && onEffect.call(this);\n },\n unlinked(this: TrivialInstance) {\n onEffect && onEffect.call(this);\n },\n } as RelationOption,\n },\n \n mixin: Behavior({\n created() {\n Object.defineProperty(this, 'parent', {\n get: () => this.getRelationNodes(path)[0],\n });\n \n Object.defineProperty(this, 'index', {\n // @ts-ignore\n get: () => this.parent?.children?.indexOf(this),\n });\n },\n }),\n };\n }\n \n export function useChildren(\n name: string,\n onEffect?: (this: TrivialInstance, target: TrivialInstance) => void\n ) {\n const path = `../${name}/index`;\n return {\n relations: {\n [path]: {\n type: 'descendant',\n linked(this: TrivialInstance, target) {\n onEffect && onEffect.call(this, target);\n },\n linkChanged(this: TrivialInstance, target) {\n onEffect && onEffect.call(this, target);\n },\n unlinked(this: TrivialInstance, target) {\n onEffect && onEffect.call(this, target);\n },\n } as RelationOption,\n },\n \n mixin: Behavior({\n created() {\n Object.defineProperty(this, 'children', {\n get: () => this.getRelationNodes(path) || [],\n });\n },\n }),\n };\n }","import { NutComponent } from './../../common/component.ts'\r\nimport { useParent } from '../../common/relation.ts'\r\n\r\nNutComponent({\r\n relation: useParent('grid'),\r\n props: {\r\n text: String,\r\n // icon\r\n icon: String,\r\n iconSize: Number,\r\n iconColor: String,\r\n replace: {\r\n type: Boolean,\r\n value: false\r\n }\r\n },\r\n\r\n data:{\r\n parent:{\r\n columnNum:4,\r\n gutter:0,\r\n center:true,\r\n square:false,\r\n border:true,\r\n reverse:false,\r\n direction:'vertical',\r\n clickable:false\r\n },\r\n iconProps:{\r\n name:'',\r\n\r\n }\r\n },\r\n\r\n methods: {\r\n updateParent:function(){\r\n const that = this\r\n this.setData({\r\n parent:that.parent.data\r\n })\r\n\r\n }\r\n },\r\n});\r\n\r\n\r\n"],"sourceRoot":""} \ No newline at end of file diff --git a/miniprogram_dev/components/packages/popup/index.js b/miniprogram_dev/components/packages/popup/index.js index 699d27f1bd4b35672d5179d712bfad029c137630..44919a613fb8c27ad9f59ea0df80355ed686fe85 100644 --- a/miniprogram_dev/components/packages/popup/index.js +++ b/miniprogram_dev/components/packages/popup/index.js @@ -206,12 +206,27 @@ var _component = __webpack_require__(0); type: String, value: 'center' }, - overlayStyle: String + overlayStyle: String, + closeable: { + type: Boolean, + value: false + }, + closeIconPosition: { + type: String, + value: 'top-right' + }, + closeIcon: { + type: String, + value: 'close' + } }, methods: { onClickOverlay: function onClickOverlay() { console.log('点击'); this.$emit('clickOverlay'); + }, + onClickCloseIcon: function onClickCloseIcon() { + this.$emit('clickCloseIcon'); } } }); diff --git a/miniprogram_dev/components/packages/popup/index.js.map b/miniprogram_dev/components/packages/popup/index.js.map index 74a1a2bfa6e674ecd2118a9775c9841aa933956a..5927e911d166184715778bedea8b354668add6b8 100644 --- a/miniprogram_dev/components/packages/popup/index.js.map +++ b/miniprogram_dev/components/packages/popup/index.js.map @@ -1 +1 @@ -{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/common/component.ts","webpack:///./src/mixins/basic.ts","webpack:///./src/packages/popup/index.ts"],"names":[],"mappings":"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","file":"packages/popup/index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 14);\n","import { basic } from '../mixins/basic.ts';\nimport { NutComponentOptions } from '../definitions/index.ts';\n\nfunction mapKeys(\n source: Record,\n target: Record,\n map: Record\n) {\n Object.keys(map).forEach((key) => {\n if (source[key]) {\n target[map[key]] = source[key];\n }\n });\n}\n\nfunction NutComponent<\n Data extends WechatMiniprogram.Component.DataOption,\n Props extends WechatMiniprogram.Component.PropertyOption,\n Methods extends WechatMiniprogram.Component.MethodOption\n>(NutOptions: NutComponentOptions): void {\n const options: WechatMiniprogram.Component.Options = {};\n\n mapKeys(NutOptions, options, {\n data: 'data',\n props: 'properties',\n mixins: 'behaviors',\n methods: 'methods',\n beforeCreate: 'created',\n created: 'attached',\n mounted: 'ready',\n destroyed: 'detached',\n classes: 'externalClasses',\n observers: 'observers'\n });\n\n // add default externalClasses\n options.externalClasses = options.externalClasses || [];\n options.externalClasses.push('custom-class');\n\n // add default behaviors\n options.behaviors = options.behaviors || [];\n options.behaviors.push(basic);\n\n // add relations\n const { relation } = NutOptions;\n if (relation) {\n options.relations = relation.relations;\n options.behaviors.push(relation.mixin);\n }\n \n // map field to form-field behavior\n if (NutOptions.field) {\n options.behaviors.push('wx://form-field');\n }\n\n // 添加默认 选项\n options.options = {\n multipleSlots: true,\n addGlobalClass: true,\n };\n\n Component(options);\n}\n\n\nmodule.exports = { NutComponent };\n","export const basic = Behavior({\n methods: {\n $emit(\n name: string,\n detail?: Record,\n options?: WechatMiniprogram.Component.TriggerEventOption\n ) {\n this.triggerEvent(name, detail, options);\n },\n \n set(data: Record) {\n this.setData(data);\n \n return new Promise((resolve) => wx.nextTick(resolve));\n },\n },\n });\n ","import { NutComponent } from './../../common/component.ts'\r\n\r\nNutComponent({\r\n props: {\r\n show: {\r\n type: Boolean,\r\n value: false\r\n },\r\n zIndex: {\r\n type: [Number, String],\r\n value: 2000\r\n },\r\n duration: {\r\n type: [Number, String],\r\n value: 300\r\n },\r\n popStyle: String,\r\n popClass: {\r\n type: String,\r\n value: ''\r\n },\r\n round: {\r\n type: Boolean,\r\n value: false\r\n },\r\n overlay: {\r\n type: Boolean,\r\n value: true\r\n },\r\n position: {\r\n type: String,\r\n value: 'center'\r\n },\r\n overlayStyle: String,\r\n },\r\n\r\n methods: {\r\n onClickOverlay(){\r\n console.log('点击')\r\n\r\n this.$emit('clickOverlay')\r\n }\r\n },\r\n});\r\n"],"sourceRoot":""} \ No newline at end of file +{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/common/component.ts","webpack:///./src/mixins/basic.ts","webpack:///./src/packages/popup/index.ts"],"names":[],"mappings":"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","file":"packages/popup/index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 14);\n","import { basic } from '../mixins/basic.ts';\nimport { NutComponentOptions } from '../definitions/index.ts';\n\nfunction mapKeys(\n source: Record,\n target: Record,\n map: Record\n) {\n Object.keys(map).forEach((key) => {\n if (source[key]) {\n target[map[key]] = source[key];\n }\n });\n}\n\nfunction NutComponent<\n Data extends WechatMiniprogram.Component.DataOption,\n Props extends WechatMiniprogram.Component.PropertyOption,\n Methods extends WechatMiniprogram.Component.MethodOption\n>(NutOptions: NutComponentOptions): void {\n const options: WechatMiniprogram.Component.Options = {};\n\n mapKeys(NutOptions, options, {\n data: 'data',\n props: 'properties',\n mixins: 'behaviors',\n methods: 'methods',\n beforeCreate: 'created',\n created: 'attached',\n mounted: 'ready',\n destroyed: 'detached',\n classes: 'externalClasses',\n observers: 'observers'\n });\n\n // add default externalClasses\n options.externalClasses = options.externalClasses || [];\n options.externalClasses.push('custom-class');\n\n // add default behaviors\n options.behaviors = options.behaviors || [];\n options.behaviors.push(basic);\n\n // add relations\n const { relation } = NutOptions;\n if (relation) {\n options.relations = relation.relations;\n options.behaviors.push(relation.mixin);\n }\n \n // map field to form-field behavior\n if (NutOptions.field) {\n options.behaviors.push('wx://form-field');\n }\n\n // 添加默认 选项\n options.options = {\n multipleSlots: true,\n addGlobalClass: true,\n };\n\n Component(options);\n}\n\n\nmodule.exports = { NutComponent };\n","export const basic = Behavior({\n methods: {\n $emit(\n name: string,\n detail?: Record,\n options?: WechatMiniprogram.Component.TriggerEventOption\n ) {\n this.triggerEvent(name, detail, options);\n },\n \n set(data: Record) {\n this.setData(data);\n \n return new Promise((resolve) => wx.nextTick(resolve));\n },\n },\n });\n ","import { NutComponent } from './../../common/component.ts'\r\n\r\nNutComponent({\r\n props: {\r\n show: {\r\n type: Boolean,\r\n value: false\r\n },\r\n zIndex: {\r\n type: [Number, String],\r\n value: 2000\r\n },\r\n duration: {\r\n type: [Number, String],\r\n value: 300\r\n },\r\n popStyle: String,\r\n popClass: {\r\n type: String,\r\n value: ''\r\n },\r\n round: {\r\n type: Boolean,\r\n value: false\r\n },\r\n overlay: {\r\n type: Boolean,\r\n value: true\r\n },\r\n position: {\r\n type: String,\r\n value: 'center'\r\n },\r\n overlayStyle: String,\r\n\r\n closeable: {\r\n type: Boolean,\r\n value: false\r\n },\r\n closeIconPosition: {\r\n type: String,\r\n value: 'top-right'\r\n },\r\n closeIcon: {\r\n type: String,\r\n value: 'close'\r\n },\r\n\r\n // lockScroll:{}\r\n },\r\n\r\n methods: {\r\n onClickOverlay(){\r\n console.log('点击')\r\n\r\n this.$emit('clickOverlay')\r\n },\r\n\r\n onClickCloseIcon(){\r\n this.$emit('clickCloseIcon')\r\n }\r\n },\r\n});\r\n"],"sourceRoot":""} \ No newline at end of file diff --git a/miniprogram_dev/components/packages/popup/index.wxml b/miniprogram_dev/components/packages/popup/index.wxml index a5eb396a0b3dce8b7e17c652591f950a450da37a..644ca980bfe6836ab6a916a0e28dc79f2b68f4a1 100644 --- a/miniprogram_dev/components/packages/popup/index.wxml +++ b/miniprogram_dev/components/packages/popup/index.wxml @@ -1,7 +1,8 @@ - - - - - - - + + + + + + \ No newline at end of file diff --git a/miniprogram_dev/components/packages/popup/index.wxs b/miniprogram_dev/components/packages/popup/index.wxs index 5d8e7d743383642e5e52b0d419308163467b7d88..9166eab4dc8da8303c8f6c7d9c7bd416d266e886 100644 --- a/miniprogram_dev/components/packages/popup/index.wxs +++ b/miniprogram_dev/components/packages/popup/index.wxs @@ -8,7 +8,7 @@ function Classes(data) { var prefixCls = 'nut-popup' - var classes = [prefixCls,prefixCls + '--' + data.position,data.popClass] + var classes = [prefixCls,prefixCls + '--' + data.position, data.popClass] if (data.round) { classes.push('round') @@ -31,7 +31,16 @@ function Styled(data) { return style([styley]); } +function AnimationName(data){ + console.log(data) + if( data.position == 'center') return 'fade' + if( data.position == 'top') return 'fade-down' + if( data.position == 'bottom') return 'fade-up' + + return 'fade-'+data.position +} module.exports = { classes: Classes, - styled: Styled + styled: Styled, + animationName:AnimationName }; diff --git a/miniprogram_dev/pages/basic/pages/popup/index.js b/miniprogram_dev/pages/basic/pages/popup/index.js index 75141abac3604860f1d1ff9ec23db636b3da6f25..13c458b764d18121ae86a2d3baff6a1b972ed5ad 100644 --- a/miniprogram_dev/pages/basic/pages/popup/index.js +++ b/miniprogram_dev/pages/basic/pages/popup/index.js @@ -4,8 +4,14 @@ Component({ data:{ show:false, positionShow: false, + position:'top', + positionLRShow:false, + positionLR:'left', styleShow:false, - timeShow:false + roundPopopShow:false, + iconPopopShow:false, + closeIconPosition:'top-right', + customIconPopopShow:false }, methods: { @@ -25,11 +31,49 @@ Component({ this.setData({ show:tag }); }, - onClickPositionShow(){ - this.setData({positionShow:true}) + onClickPositionShow(e){ + var posi = e.target.dataset.position + this.setData({ + position:posi, + positionShow:true + }) + }, + onClickPositionLRShow(e){ + var posi = e.target.dataset.position + this.setData({ + positionLR:posi, + positionLRShow:true + }) }, onClickPositionHide(){ - this.setData({positionShow:false}) - } + this.setData({ + positionLRShow:false, + positionShow:false}) + }, + + onClickRoundHide(){ + this.setData({ roundPopopShow:false }); + }, + onClickRoundShow(){ + this.setData({ roundPopopShow:true }); + }, + onClickIconShow(e){ + var posi = e.target.dataset.position + if(posi){ + this.setData({ + closeIconPosition:posi + }) + } + this.setData({ iconPopopShow:true }); + }, + onClickIconHide(){ + this.setData({ iconPopopShow:false }); + }, + onClickCustomIconShow(e){ + this.setData({ customIconPopopShow:true }); + }, + onClickCustomIconHide(){ + this.setData({ customIconPopopShow:false }); + }, } }) diff --git a/miniprogram_dev/pages/basic/pages/popup/index.wxml b/miniprogram_dev/pages/basic/pages/popup/index.wxml index 53a623689ecb3690633be666f73f121bc42d873c..7e9614e0efda8f34e076e18f83ebb4ada758adbd 100644 --- a/miniprogram_dev/pages/basic/pages/popup/index.wxml +++ b/miniprogram_dev/pages/basic/pages/popup/index.wxml @@ -2,21 +2,29 @@

基础用法

- 正文 + 正文 +

弹出位置

- - - - - + + + + + + + + +

关闭图标

- - - + + + + + + +

圆角弹框

+ + -

圆角弹框

- - diff --git a/miniprogram_dev/pages/basic/pages/popup/index.wxss b/miniprogram_dev/pages/basic/pages/popup/index.wxss index 69694ee55b35fa7f72c1c02fd7f3f88b83547de6..8fc5289964160a355ea086778de3945a03719022 100644 --- a/miniprogram_dev/pages/basic/pages/popup/index.wxss +++ b/miniprogram_dev/pages/basic/pages/popup/index.wxss @@ -1,27 +1,6 @@ -.demo-button-row { - margin-bottom: 20px; -} -.demo-button-row2 { - margin-bottom: 10px; -} -.demo-button-row3{ - margin-bottom: 10px; - display:block -} -.nut-button { - margin-right: 15px; - -} - - -.block { - position: fixed; - top: 50%; - left: 50%; - width: 100px; - height: 100px; - margin: -50px 0 0 -50px; +.demoContent { + background-color: #1989fa; } \ No newline at end of file diff --git a/miniprogram_dev/pages/basic/pages/transition/index.js b/miniprogram_dev/pages/basic/pages/transition/index.js index 9f77c26a069fd71f6ad6098da07ea457c8cf15b0..bc82caf881d48647322aae5e466dbeedbaf033ed 100644 --- a/miniprogram_dev/pages/basic/pages/transition/index.js +++ b/miniprogram_dev/pages/basic/pages/transition/index.js @@ -9,7 +9,6 @@ Component({ methods: { onClickFade() { - console.log('点击') this.trigger('fade'); }, @@ -48,9 +47,9 @@ Component({ onClickCustom() { this.setData({ showCustom: true }); - setTimeout(()=>{ - this.setData({ showCustom: false }); - }, 1000) + // setTimeout(()=>{ + // this.setData({ showCustom: false }); + // }, 1000) }, trigger(name){ diff --git a/src/packages/grid-item/index.ts b/src/packages/grid-item/index.ts index 451d19c40d1bc5ecc821bbb748e5be374e8df8d1..e17ed931a6c436983575bfa955a449ac69415bc8 100644 --- a/src/packages/grid-item/index.ts +++ b/src/packages/grid-item/index.ts @@ -23,7 +23,7 @@ NutComponent({ square:false, border:true, reverse:false, - direction:'horizontal', + direction:'vertical', clickable:false }, iconProps:{ @@ -34,7 +34,6 @@ NutComponent({ methods: { updateParent:function(){ - console.log('更新地址',this.parent.data) const that = this this.setData({ parent:that.parent.data diff --git a/src/packages/popup/index.ts b/src/packages/popup/index.ts index 0937a7f64943267ba9e298a8f9fb1542f3c59ea0..b789d00fc74b97eb1970e9b76bb95cbd29d14e4f 100644 --- a/src/packages/popup/index.ts +++ b/src/packages/popup/index.ts @@ -32,6 +32,21 @@ NutComponent({ value: 'center' }, overlayStyle: String, + + closeable: { + type: Boolean, + value: false + }, + closeIconPosition: { + type: String, + value: 'top-right' + }, + closeIcon: { + type: String, + value: 'close' + }, + + // lockScroll:{} }, methods: { @@ -39,6 +54,10 @@ NutComponent({ console.log('点击') this.$emit('clickOverlay') + }, + + onClickCloseIcon(){ + this.$emit('clickCloseIcon') } }, }); diff --git a/src/packages/popup/index.wxml b/src/packages/popup/index.wxml index a5eb396a0b3dce8b7e17c652591f950a450da37a..644ca980bfe6836ab6a916a0e28dc79f2b68f4a1 100644 --- a/src/packages/popup/index.wxml +++ b/src/packages/popup/index.wxml @@ -1,7 +1,8 @@ - - - - - - - + + + + + + \ No newline at end of file diff --git a/src/packages/popup/index.wxs b/src/packages/popup/index.wxs index 12c66f388e3e9e19f5545b4be7ad330feee948e2..9166eab4dc8da8303c8f6c7d9c7bd416d266e886 100644 --- a/src/packages/popup/index.wxs +++ b/src/packages/popup/index.wxs @@ -31,7 +31,16 @@ function Styled(data) { return style([styley]); } +function AnimationName(data){ + console.log(data) + if( data.position == 'center') return 'fade' + if( data.position == 'top') return 'fade-down' + if( data.position == 'bottom') return 'fade-up' + + return 'fade-'+data.position +} module.exports = { classes: Classes, - styled: Styled + styled: Styled, + animationName:AnimationName }; diff --git a/tools/demo/pages/basic/pages/popup/index.js b/tools/demo/pages/basic/pages/popup/index.js index 75141abac3604860f1d1ff9ec23db636b3da6f25..13c458b764d18121ae86a2d3baff6a1b972ed5ad 100644 --- a/tools/demo/pages/basic/pages/popup/index.js +++ b/tools/demo/pages/basic/pages/popup/index.js @@ -4,8 +4,14 @@ Component({ data:{ show:false, positionShow: false, + position:'top', + positionLRShow:false, + positionLR:'left', styleShow:false, - timeShow:false + roundPopopShow:false, + iconPopopShow:false, + closeIconPosition:'top-right', + customIconPopopShow:false }, methods: { @@ -25,11 +31,49 @@ Component({ this.setData({ show:tag }); }, - onClickPositionShow(){ - this.setData({positionShow:true}) + onClickPositionShow(e){ + var posi = e.target.dataset.position + this.setData({ + position:posi, + positionShow:true + }) + }, + onClickPositionLRShow(e){ + var posi = e.target.dataset.position + this.setData({ + positionLR:posi, + positionLRShow:true + }) }, onClickPositionHide(){ - this.setData({positionShow:false}) - } + this.setData({ + positionLRShow:false, + positionShow:false}) + }, + + onClickRoundHide(){ + this.setData({ roundPopopShow:false }); + }, + onClickRoundShow(){ + this.setData({ roundPopopShow:true }); + }, + onClickIconShow(e){ + var posi = e.target.dataset.position + if(posi){ + this.setData({ + closeIconPosition:posi + }) + } + this.setData({ iconPopopShow:true }); + }, + onClickIconHide(){ + this.setData({ iconPopopShow:false }); + }, + onClickCustomIconShow(e){ + this.setData({ customIconPopopShow:true }); + }, + onClickCustomIconHide(){ + this.setData({ customIconPopopShow:false }); + }, } }) diff --git a/tools/demo/pages/basic/pages/popup/index.wxml b/tools/demo/pages/basic/pages/popup/index.wxml index 53a623689ecb3690633be666f73f121bc42d873c..7e9614e0efda8f34e076e18f83ebb4ada758adbd 100644 --- a/tools/demo/pages/basic/pages/popup/index.wxml +++ b/tools/demo/pages/basic/pages/popup/index.wxml @@ -2,21 +2,29 @@

基础用法

- 正文 + 正文 +

弹出位置

- - - - - + + + + + + + + +

关闭图标

- - - + + + + + + +

圆角弹框

+ + -

圆角弹框

- - diff --git a/tools/demo/pages/basic/pages/popup/index.wxss b/tools/demo/pages/basic/pages/popup/index.wxss index 69694ee55b35fa7f72c1c02fd7f3f88b83547de6..8fc5289964160a355ea086778de3945a03719022 100644 --- a/tools/demo/pages/basic/pages/popup/index.wxss +++ b/tools/demo/pages/basic/pages/popup/index.wxss @@ -1,27 +1,6 @@ -.demo-button-row { - margin-bottom: 20px; -} -.demo-button-row2 { - margin-bottom: 10px; -} -.demo-button-row3{ - margin-bottom: 10px; - display:block -} -.nut-button { - margin-right: 15px; - -} - - -.block { - position: fixed; - top: 50%; - left: 50%; - width: 100px; - height: 100px; - margin: -50px 0 0 -50px; +.demoContent { + background-color: #1989fa; } \ No newline at end of file diff --git a/tools/demo/pages/basic/pages/transition/index.js b/tools/demo/pages/basic/pages/transition/index.js index 9f77c26a069fd71f6ad6098da07ea457c8cf15b0..bc82caf881d48647322aae5e466dbeedbaf033ed 100644 --- a/tools/demo/pages/basic/pages/transition/index.js +++ b/tools/demo/pages/basic/pages/transition/index.js @@ -9,7 +9,6 @@ Component({ methods: { onClickFade() { - console.log('点击') this.trigger('fade'); }, @@ -48,9 +47,9 @@ Component({ onClickCustom() { this.setData({ showCustom: true }); - setTimeout(()=>{ - this.setData({ showCustom: false }); - }, 1000) + // setTimeout(()=>{ + // this.setData({ showCustom: false }); + // }, 1000) }, trigger(name){